diff --git a/flake.lock b/flake.lock index 7f93679..e3b5268 100644 --- a/flake.lock +++ b/flake.lock @@ -442,11 +442,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1728742719, - "narHash": "sha256-t9xlU0hrWSrQenblkg0Mq1wBx4I6A2IdgoVT3/kAx2I=", + "lastModified": 1728752206, + "narHash": "sha256-r5xU/LqU4TrUOIouhYqrTZc1VY1zLQOOzbLsFCDlfpI=", "ref": "refs/heads/main", - "rev": "c3f7c9bbb52b9ad3d24ccfcc5c552ed16c9985a5", - "revCount": 5331, + "rev": "1822707c7e7394ce8c7572f2fe890763a307f499", + "revCount": 5332, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -823,6 +823,21 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1728762317, + "narHash": "sha256-bEy9sZy4K2owEYrc+9WTqYTyWxjxK/WfusH+RDngNZU=", + "owner": "nix-community", + "repo": "NUR", + "rev": "0d5a843741d2c551f3023bff528f236ec0dfe9d0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", @@ -854,15 +869,9 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { -<<<<<<< Updated upstream "lastModified": 1, "narHash": "sha256-bjrRxs4ja1ulvgjlWN5IwfGdAVOwYQR6YSPCRVje52E=", "path": "./pkgs/nixvim", -======= - "lastModified": 1728747549, - "narHash": "sha256-9n6nu8BS4MWpoQLyDqyGXaeJb6G9IzwQgbFjwvBdPL0=", - "path": "/home/pagedmov/sysflakes/glasshouse-desktop/home/nixvim", ->>>>>>> Stashed changes "type": "path" }, "original": { @@ -929,6 +938,7 @@ "hyprland": "hyprland", "hyprpicker": "hyprpicker", "nixpkgs": "nixpkgs_4", + "nur": "nur", "nvim": "nvim", "spicetify-nix": "spicetify-nix", "toilet": "toilet" diff --git a/flake.nix b/flake.nix index 14e00c0..4399158 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - + nur.url = "github:nix-community/NUR"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -43,7 +43,7 @@ toilet.url = "path:./pkgs/toilet"; }; - outputs = { nixpkgs, home-manager, self, nvim, toilet, ... }@inputs: + outputs = { nixpkgs, nur, home-manager, self, nvim, toilet, ... }@inputs: let system = "x86_64-linux"; username = "pagedmov"; @@ -57,6 +57,7 @@ inherit system; modules = [ ./glasshouse-desktop/sys + nur.nixosModules.nur ]; }; diff --git a/glasshouse-desktop/home/default.nix b/glasshouse-desktop/home/default.nix index fd22530..856e61f 100644 --- a/glasshouse-desktop/home/default.nix +++ b/glasshouse-desktop/home/default.nix @@ -1,9 +1,10 @@ -{ inputs, username, system, ... }: +{ nur, inputs, username, system, ... }: { imports = [ (import ./btop.nix) ] ++ [ (import ./bat.nix) ] + ++ [ (import ./firefox.nix) ] ++ [ (import ./cava.nix) ] ++ [ (import ./fuzzel.nix) ] ++ [ (import ./gtk.nix) ] diff --git a/glasshouse-desktop/home/firefox.nix b/glasshouse-desktop/home/firefox.nix new file mode 100644 index 0000000..5e63ea7 --- /dev/null +++ b/glasshouse-desktop/home/firefox.nix @@ -0,0 +1,47 @@ +{ nur, username, ... }: + +{ + programs.firefox = { + enable = true; + profiles.${username} = { + name = "${username}"; + isDefault = true; + bookmarks = [ + { name = "NixOS Options"; + url = "https://search.nixos.org/options"; + } + { name = "Home Manager Options"; + url = "https://home-manager-options.extranix.com/"; + } + { name = "Nixvim Docs"; + url = "https://nix-community.github.io/nixvim/"; + } + { name = "Rust Manual"; + url = "https://doc.rust-lang.org/book/ch01-03-hello-cargo.html"; + } + { name = "ChatGPT"; + url = "https://chatgpt.com/"; + } + { name = "DataAnnotation"; + url = "https://app.dataannotation.tech/users/sign_in"; + } + { name = "Nerd Fonts Cheatsheet"; + url = "https://www.nerdfonts.com/cheat-sheet"; + } + ]; + extensions = with nur.repos.rycee.firefox-addons; [ + darkreader + adnauseam + cookie-autodelete + disconnect + vimium + firenvim + privacy-badger + ]; + settings = { + "extensions.autoDisableScopes" = 0; + "browser.startup.homepage" = "https://nixos.org"; + }; + }; + }; +} diff --git a/glasshouse-desktop/home/userpkgs.nix b/glasshouse-desktop/home/userpkgs.nix index 5c3c458..144963e 100644 --- a/glasshouse-desktop/home/userpkgs.nix +++ b/glasshouse-desktop/home/userpkgs.nix @@ -5,7 +5,6 @@ let in { home.packages = with pkgs; [ - hello gtk3 adwaita-icon-theme uhk-agent @@ -16,7 +15,6 @@ in zathura inkscape imagemagick - firefox yt-dlp vlc speedtest-cli diff --git a/glasshouse-desktop/sys/default.nix b/glasshouse-desktop/sys/default.nix index f7c407a..b045265 100644 --- a/glasshouse-desktop/sys/default.nix +++ b/glasshouse-desktop/sys/default.nix @@ -1,4 +1,4 @@ -{ inputs, nixpkgs, self, username, ... }: +{ inputs, nixpkgs, config, username, ... }: { imports = diff --git a/glasshouse-desktop/sys/users.nix b/glasshouse-desktop/sys/users.nix index 60c27e1..5a91f41 100644 --- a/glasshouse-desktop/sys/users.nix +++ b/glasshouse-desktop/sys/users.nix @@ -1,12 +1,15 @@ { config, inputs, pkgs, username, ... }: +let + nur = config.nur; +in { imports = [ inputs.home-manager.nixosModules.home-manager ]; home-manager = { useUserPackages = true; useGlobalPkgs = true; backupFileExtension = "backup"; - extraSpecialArgs = { inherit inputs username; }; + extraSpecialArgs = { inherit inputs username nur; }; users.${username} = { programs.home-manager.enable = true; imports = [ ./../home ];