Skip to content

Commit

Permalink
feat: update to nixos-24.05
Browse files Browse the repository at this point in the history
  • Loading branch information
mrnossiom committed Jun 12, 2024
1 parent f0276db commit 817485d
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 63 deletions.
108 changes: 52 additions & 56 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
description = "NixOS and Home Manager configuration for Milo's laptops";

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Also see the 'unstable-packages' overlay at 'overlays/default.nix'.

home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";

agenix.url = "github:ryantm/agenix";
Expand Down Expand Up @@ -48,7 +48,7 @@
# This should be the only constructed nixpkgs instances in this flake
pkgs = forAllSystems (system: (import nixpkgs {
inherit system;
config.allowUnfreePredicate = import ./lib/unfree.nix;
config.allowUnfreePredicate = import ./lib/unfree.nix { lib = nixpkgs.lib; };
overlays = [ outputs.overlays.all ];
}));
in
Expand Down
13 changes: 13 additions & 0 deletions home-manager/modules/firefox.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,25 @@ in
"widget.use-xdg-desktop-portal.file-picker" = 1;
"browser.aboutConfig.showWarning" = false;

# Enable meta devtools to inspect Firefox Chrome UI
"devtools.chrome.enabled" = true;
"devtools.debugger.remote-enabled" = true;

# Pickup userChrome styles at startup
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;

# Firefox 75+ remembers the last workspace it was opened on as part of its session management.
# This is annoying, because I can have a blank workspace, click Firefox from the launcher, and
# then have Firefox open on some other workspace.
"widget.disable-workspace-management" = true;
};

# <https://www.userchrome.org/how-create-userchrome-css.html>
userChrome = ''
/* Hide close button */
.titlebar-close { display: none !important; }
'';

search = {
force = true;
default = "DuckDuckGo";
Expand Down
2 changes: 1 addition & 1 deletion home-manager/modules/git.nix
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ with lib;
};
};

home.packages = with pkgs; [ git-leave git-along radicle-cli radicle-httpd radicle-node ];
home.packages = with pkgs; [ git-leave git-along radicle-node ];

programs.gh.enable = true;

Expand Down
26 changes: 26 additions & 0 deletions home-manager/modules/thunderbird.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ ... }:

{
config = {
programs.thunderbird = {
enable = true;

profiles.default = {
isDefault = true;

settings = {
# Enable meta devtools to inspect Thunderbird Chrome UI
"devtools.chrome.enabled" = true;
"devtools.debugger.remote-enabled" = true;
};

# <https://www.userchrome.org/how-create-userchrome-css.html>
userChrome = ''
/* Hide close button */
.titlebar-close { display: none !important; }
'';
};
};
};
}

1 change: 1 addition & 0 deletions home-manager/profiles/desktop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ in
"firefox.nix"
"git.nix"
"shell.nix"
"thunderbird.nix"
"vm"
];

Expand Down
4 changes: 3 additions & 1 deletion lib/unfree.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{ lib }:

# List of all unfree packages authorized
package: builtins.elem package.pname [
package: builtins.elem (lib.getName package) [
# NixOS
"hplip"
"steam"
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/wireless.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

services.avahi = {
enable = true;
nssmdns = true;
nssmdns4 = true;
openFirewall = true;
};
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ in
inherit (agenix.packages.${system}) agenix;
inherit (git-leave.packages.${system}) git-leave;
inherit (mind.packages.${system}) mind;
inherit (radicle.packages.${system}) radicle-cli radicle-remote-helper radicle-httpd radicle-node;
inherit (radicle.packages.${system}) radicle;
inherit (wakatime-lsp.packages.${system}) wakatime-lsp;
}

0 comments on commit 817485d

Please sign in to comment.