diff --git a/flake.lock b/flake.lock index c7b5071..0aa3a10 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cl-nix-lite": { "locked": { - "lastModified": 1717972076, - "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=", + "lastModified": 1728174978, + "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=", "owner": "hraban", "repo": "cl-nix-lite", - "rev": "cc920bfb0a6402d3871f470c98d65266126973e4", + "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732161788, - "narHash": "sha256-ilkOtBbv5onnMOYnLWVpBd6bZHP3xwzagccBk1mW/z4=", + "lastModified": 1733198595, + "narHash": "sha256-7n66bpxbXkwBow1VSVHQe+rEW+8zPyawmDJ7Rd0uHNI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3071fc96bc39e58df1c6d48e8008c96f09a00b42", + "rev": "51d5446f359b67d5b6fdf45a145391c4d8679b3e", "type": "gitlab" }, "original": { @@ -41,15 +41,16 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1730674701, - "narHash": "sha256-lf9MQs8+NUvQd8b5t+7c4kLqUQixGO9WwWcLa1XYuiQ=", + "lastModified": 1732798888, + "narHash": "sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM+ejiZGCsH9MK0s0=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "823756d8ddd21cfd3a24a87dad402e490e0eb5ee", + "rev": "ef6ac4285eaac6053338a6240bc615902a839493", "type": "github" }, "original": { "owner": "rafaelmardojai", + "ref": "v133", "repo": "firefox-gnome-theme", "type": "github" } @@ -73,11 +74,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1697816753, - "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=", + "lastModified": 1730663653, + "narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=", "owner": "hraban", "repo": "flake-compat", - "rev": "6025bade1336a36014639bc3f67eacc853dab78f", + "rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e", "type": "github" }, "original": { @@ -104,14 +105,17 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": [ + "mac-app-util", + "systems" + ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -126,11 +130,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -144,14 +148,15 @@ "cl-nix-lite": "cl-nix-lite", "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1731385712, - "narHash": "sha256-hcPGb+Voh1N+SD3XuwgcwDMA6W/lGkXLCnd3mttoLoA=", + "lastModified": 1732920695, + "narHash": "sha256-1fxvJZUznwrmEtYqpPuWi2tPcL9kj6v7p1J7ZZncAPE=", "owner": "hraban", "repo": "mac-app-util", - "rev": "9ef4d1c14dab18a95691602bf541cd091fdcc2e3", + "rev": "548672d0cb661ce11d08ee8bde92b87d2a75c872", "type": "github" }, "original": { @@ -165,11 +170,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -179,17 +184,33 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717868076, - "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", + "type": "github" + } + }, + "nixpkgs-2405": { + "locked": { + "lastModified": 1733016324, + "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", "type": "github" } }, @@ -209,11 +230,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -225,11 +246,11 @@ }, "nur": { "locked": { - "lastModified": 1732218405, - "narHash": "sha256-+aw2RvxAoGc5FgnQSpLlt+QNcnRPFfp4/Vts7cfo6rE=", + "lastModified": 1733215745, + "narHash": "sha256-RIlhnKlObJ1sEdzBP6Nuy4jLUiQnmWWXVsRHRbv6SzY=", "owner": "nix-community", "repo": "NUR", - "rev": "e256ca80ae399c3eea5e0cbe47f9a641877286c5", + "rev": "251d756a74e67bda25d89327b01a3da19dddabae", "type": "github" }, "original": { @@ -247,21 +268,22 @@ "mac-app-util": "mac-app-util", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_3", + "nixpkgs-2405": "nixpkgs-2405", "nur": "nur" } }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347925, + "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-darwin", + "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-darwin", "type": "github" } } diff --git a/flake.nix b/flake.nix index c70b851..6d12f63 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,12 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05"; home.url = "github:nix-community/home-manager"; home.inputs.nixpkgs.follows = "nixpkgs"; - firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; }; + firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme/v133"; flake = false; }; firefox-macos-theme = {url = "github:AdamXweb/WhiteSurFirefoxThemeMacOS"; flake = false; }; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -15,7 +16,7 @@ mac-app-util.url = "github:hraban/mac-app-util"; }; - outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util }@inputs: { + outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util, nixpkgs-2405 }@inputs: { nixosConfigurations.iota = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ diff --git a/home.nix b/home.nix index 4c4d751..71e4e6d 100644 --- a/home.nix +++ b/home.nix @@ -25,6 +25,7 @@ nix-direnv.enable = true; }; + fonts.fontconfig.enable = true; home.packages = with pkgs; [ bat bottom @@ -50,9 +51,15 @@ zip coreutils zotero + ollama + inputs.nixpkgs-2405.legacyPackages.${system}.signal-desktop-beta + # fonts - (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) + nerd-fonts.fira-code + nerd-fonts.fira-mono + nerd-fonts.droid-sans-mono + borg-sans-mono noto-fonts noto-fonts-cjk-sans noto-fonts-emoji diff --git a/nixos.nix b/nixos.nix index 7cbea58..3375842 100644 --- a/nixos.nix +++ b/nixos.nix @@ -7,7 +7,7 @@ ]; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' experimental-features = nix-command flakes ''; @@ -16,6 +16,7 @@ networking.networkmanager.enable = true; + services.wg-netmanager.enable = true; time.timeZone = "Europe/Amsterdam"; @@ -47,7 +48,6 @@ services.printing.enable = true; - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -91,7 +91,7 @@ udev usbutils - gnome.gnome-tweaks + gnome-tweaks gnomeExtensions.tray-icons-reloaded gnomeExtensions.clipboard-history @@ -101,11 +101,11 @@ aspell aspellDicts.en aspellDicts.nl - gnome.networkmanager-openvpn + networkmanager-openvpn ]; services.udev.packages = with pkgs; [ - gnome.gnome-settings-daemon + gnome-settings-daemon android-udev-rules ]; services.fprintd.enable = true; diff --git a/platforms/linux/home.nix b/platforms/linux/home.nix index c8a228b..2f1ffc8 100644 --- a/platforms/linux/home.nix +++ b/platforms/linux/home.nix @@ -85,4 +85,4 @@ "picture-uri" = "${config.home.homeDirectory}/.background-image"; }; }; -} \ No newline at end of file +} diff --git a/programs/bash.nix b/programs/bash.nix index 992dd66..24b7e3f 100644 --- a/programs/bash.nix +++ b/programs/bash.nix @@ -44,13 +44,20 @@ free = "free -h"; toupper = "tr [:lower:] [:upper:]"; tolower = "tr [:upper:] [:lower:]"; - rebuild = if (os == "linux") then '' - nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo + rebuild = if (os == "linux") then '' + cd $HOME/.local/os && + nix flake update --commit-lock-file + nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo && + cd - '' else '' - home-manager switch + cd $HOME/.local/os && + nix flake update --commit-lock-file + home-manager switch && + cd - ''; ":r" = "!!"; ":wq" = "exit"; + vim = "hx"; }; programs.bash.sessionVariables = { NIX_SHELL_PRESERVE_PROMPT = 1; diff --git a/programs/firefox.nix b/programs/firefox.nix index b04351a..797cf0d 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -48,6 +48,7 @@ consent-o-matic sponsorblock multi-account-containers + privacy-redirect ] ++ (if (os == "darwin") then [ onepassword-password-manager ] else [ @@ -55,6 +56,7 @@ h264ify fediact tampermonkey + laboratory-by-mozilla ]); search = { default = "DuckDuckGo"; @@ -92,4 +94,4 @@ } ]; } -] \ No newline at end of file +]