tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

nixbook: update

Browse source
This commit is contained in:
Tristan 2024-04-16 14:11:22 +01:00
parent 30a1a46729
commit 1af7b80a6f
5 changed files with 29 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

186
flake.lock generated
View file

@ -203,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1713166971,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15", "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,89 +238,13 @@
"type": "github" "type": "github"
} }
}, },
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1709080360,
"narHash": "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "1c460e98f870676b15871fe4e5bfeb1a32a3d6d8",
"type": "github"
},
"original": {
"owner": "hyprwm",
"ref": "v0.36.0",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1709082138,
"narHash": "sha256-upV2PWOoQ5hKbeuMwiJ4RJUa1JDVqzxdr5LL7YJJ/f4=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "42c66f6b44eb9ac64af9b6ef26325c16909a7650",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709150264, "lastModified": 1712963716,
"narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,11 +255,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1708819810, "lastModified": 1713042715,
"narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", "narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", "rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -347,11 +271,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1708751719, "lastModified": 1712883908,
"narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,7 +304,6 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stable-nixpkgs": "stable-nixpkgs", "stable-nixpkgs": "stable-nixpkgs",
@ -393,11 +316,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1708987867, "lastModified": 1713174909,
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -408,11 +331,11 @@
}, },
"stable-nixpkgs": { "stable-nixpkgs": {
"locked": { "locked": {
"lastModified": 1709218635, "lastModified": 1713013257,
"narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=", "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "068d4db604958d05d0b46c47f79b507d84dbc069", "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +361,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1708896938, "lastModified": 1713025302,
"narHash": "sha256-oMjkMjeNhDUEpKIofo9+9RdUnmmZ4h0sm+kf6XKdy6k=", "narHash": "sha256-za4w2wYt1fg9EdTv5fYLwEqAyHgPmPq88HmlxirXuEk=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "fcff15ac5ffbe81f1c66e352f3167c270d79cdab", "rev": "83866ed8800ed39519a79ea30b18c8eb21f26080",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -450,73 +373,6 @@
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1708558866,
"narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1706145785,
"narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "5a592647587cd20b9692a347df6939b6d371b3bb",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

10
flake.nix
View file

@ -9,10 +9,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
hyprland = { # hyprland = {
url = "github:hyprwm/Hyprland/v0.36.0"; # url = "github:hyprwm/Hyprland/v0.36.0";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; # };
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
}; };
@ -46,7 +46,7 @@
FCS-Tristan-Nixbook = FCS-Tristan-Nixbook =
mkConf [ mkConf [
inputs.hyprland.nixosModules.default # inputs.hyprland.nixosModules.default
./hardware/fcs-tristan-nixbook.nix ./hardware/fcs-tristan-nixbook.nix
(auto-login "Hyprland") (auto-login "Hyprland")
./nixos/modules/work.nix ./nixos/modules/work.nix

2
home/programs/zsh.nix
View file

@ -11,7 +11,7 @@
path = "${config.xdg.dataHome}/zsh/zsh_history"; path = "${config.xdg.dataHome}/zsh/zsh_history";
}; };
autocd = true; autocd = true;
enableAutosuggestions = true; autosuggestion.enable = true;
completionInit = '' completionInit = ''
autoload -U compinit && compinit autoload -U compinit && compinit
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'

2
home/workstation.nix
View file

@ -36,7 +36,7 @@
notify = true; notify = true;
}; };
programs.rbw.settings.pinentry = "gnome3"; programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ"; home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = '' home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = ''

3
lib/mkconf.nix
View file

@ -5,7 +5,7 @@
userFullname, userFullname,
... ...
}: modules: home-modules: let }: modules: home-modules: let
inherit (inputs) home-manager nixpkgs hyprland sops-nix; inherit (inputs) home-manager nixpkgs sops-nix;
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
@ -24,7 +24,6 @@ in
users.${user}.imports = users.${user}.imports =
home-modules home-modules
++ [ ++ [
hyprland.homeManagerModules.default
../home/. ../home/.
{ {
options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;}; options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;};