blue/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

overlayed nixpkgs to allow for pkgs.stable pkgs.main and pkgs.nur

Browse source 
also passed to home-manager and gabbielaptop config
This commit is contained in:
Gabriella Bere 2025-01-03 22:15:57 +00:00
parent 8ad1d43730
commit a7a31c0646
5 changed files with 91 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

126
flake.lock generated
View file

@ -110,11 +110,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728330715, "lastModified": 1735644329,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,11 +130,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735048446, "lastModified": 1735468753,
"narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +234,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1735774679,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,18 +354,14 @@
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1734797603, "lastModified": 1735882644,
"narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -461,11 +457,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735381016, "lastModified": 1735925111,
"narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -482,11 +478,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734862405, "lastModified": 1735900408,
"narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +499,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733085484, "lastModified": 1735774425,
"narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -574,11 +570,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1734848678, "lastModified": 1735772949,
"narHash": "sha256-HtGPXGyzOsHJLq6nwvBV763y6l7fC9FuWIM0hNh1Y6E=", "narHash": "sha256-lvee0rhKTpJEDl1SC4F3Kvz88snOU8OMTJBsPH1pVBo=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "e76b3cdd23d49a11210a551f8ea4d49d7022e639", "rev": "86ef22cbdd7551ef325bce88143be9f37da64c26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -595,11 +591,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733570843, "lastModified": 1735685839,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "narHash": "sha256-62xAPSs5VRZoPH7eRanUn5S5vZEd+8vM4bD5I+zxokc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8", "rev": "6a1fdb2a1204c0de038847b601cff5012e162b5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +622,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1735468399, "lastModified": 1735941500,
"narHash": "sha256-aK9OM244zYI7/8NWRbUK+Ml2tErFyerHuXwb6GdpWsc=", "narHash": "sha256-kEPITJEA41+kVSykS2h6SbiTSnfZfcNEy5pM+nV7584=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9640018b2247891251565852d6218d57c135a495", "rev": "4246e8e0e86abc030660ade5429d8170c755e543",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +654,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1735264675, "lastModified": 1735669367,
"narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -690,11 +686,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1734424634, "lastModified": 1735291276,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -706,11 +702,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1735291276, "lastModified": 1735834308,
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -722,11 +718,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1735291276, "lastModified": 1735834308,
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -738,16 +734,16 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1732238832, "lastModified": 1735648875,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -767,11 +763,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1735378670, "lastModified": 1735937973,
"narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", "narHash": "sha256-kUNsnN7AUMS7I/GOSRCdftM77zY4EOuEROlE7whBRPU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", "rev": "4f4917be697e7ef39ebada3737e51cb42e0cbe79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,11 +783,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1735463528, "lastModified": 1735940739,
"narHash": "sha256-zr2UZCcNj+slr5F+weZn02BBA/LaqhgGtNkx2RHNPcQ=", "narHash": "sha256-Vdg/mPGEmrjOeq/I4a6xHhAZRMVugjPedJ3TDkpnEhM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "493dbcd9df5aa49af2695721fc10978009b64dad", "rev": "396a933861890641cb65411e244870c858f98f0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -810,11 +806,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733773348, "lastModified": 1735854821,
"narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -947,11 +943,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1735253599, "lastModified": 1735933801,
"narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=", "narHash": "sha256-SbkFaIYzfoasvu6GN5fdlaltrcEtUcoPsTRulWNkH7E=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a", "rev": "e0a41d3a2562ce1b43cad8560333673d04b111b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1063,11 +1059,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734704479, "lastModified": 1735905407,
"narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8",
"type": "github" "type": "github"
}, },
"original": { "original": {

36
flake.nix
View file

@ -58,26 +58,28 @@
}@inputs: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config = {allowUnfree = true;};
overlays = [
overlay-stable
overlay-master
nur.overlays.default
];
};
genericModules = [ genericModules = [
{ {
nix.registry.nixos.flake = inputs.self; nix.registry.nixos.flake = inputs.self;
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ]; nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
} }
# inputs.home-manager.nixosModules.home-manager
# {
# nix.registry.nixos.flake = inputs.self;
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# }
({ config, pkgs, ... }: {
nixpkgs.overlays = [
overlay-stable
overlay-master
nur.overlay
]; ];
genericHomeModule = [
{
nix.registry.nixos.flake = inputs.self;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
} }
)
]; ];
# Overlay definitions # Overlay definitions
# nixpkgs-unstable # nixpkgs-unstable
@ -98,6 +100,7 @@
{ {
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem { nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
inherit pkgs;
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
}; };
@ -111,8 +114,11 @@
inputs.aagl.nixosModules.default inputs.aagl.nixosModules.default
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.musnix.nixosModules.musnix inputs.musnix.nixosModules.musnix
# inputs.stylix.nixosModules.stylix # inputs.stylix.nixosModules.stylix
# inputs.home-manager.nixosModules.home-manager
# inputs.nixvim.homeManagerModules.nixvim
{ nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
# { home-manager.users.blue = ./home-manager/home.nix; }
]; ];
}; };
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem { nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
@ -127,15 +133,13 @@
# Standalone home-manager config # Standalone home-manager config
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration { homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; inherit pkgs;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
}; };
# Import home-manager modules here # Import home-manager modules here
modules = [ modules = [
./home-manager/home.nix ./home-manager/home.nix
# ./home-manager/librewolf.nix
inputs.flatpaks.homeManagerModules.declarative-flatpak
inputs.nixvim.homeManagerModules.default inputs.nixvim.homeManagerModules.default
inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
]; ];

6
home-manager/home.nix
View file

@ -15,7 +15,7 @@
./waybar.nix ./waybar.nix
./swaync.nix ./swaync.nix
# ./flatpak.nix # ./flatpak.nix
./sober.nix # ./sober.nix
./hyprlock.nix ./hyprlock.nix
./zsh.nix ./zsh.nix
./eza.nix ./eza.nix
@ -81,6 +81,9 @@
programs.tmux.enable = true; programs.tmux.enable = true;
programs.btop.enable = true;
programs.btop.package = pkgs.stable.btop-rocm;
# Add support for bluetooth headset media controls # Add support for bluetooth headset media controls
services.mpris-proxy.enable = true; services.mpris-proxy.enable = true;
@ -121,5 +124,4 @@
# }; # };
services.blueman-applet.enable = true; services.blueman-applet.enable = true;
programs.btop.enable = true;
} }

6
home-manager/hyprland.nix
View file

@ -24,9 +24,9 @@
kb_layout = "gb"; kb_layout = "gb";
follow_mouse = 1; follow_mouse = 1;
mouse_refocus = false; mouse_refocus = false;
touchpad = { # touchpad = {
disable_while_typing = false; # disable_while_typing = false;
}; # };
}; };
bindl = [ bindl = [

3
hosts/gabbielaptop/configuration.nix
View file

@ -175,9 +175,6 @@
# Install firefox. # Install firefox.
programs.firefox.enable = true; programs.firefox.enable = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Enable flatpak for delcarative-flatpak used in home-manager # Enable flatpak for delcarative-flatpak used in home-manager
# services.flatpak.enable = true; # services.flatpak.enable = true;