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

Merge branch 'master' onto server

Browse source
This commit is contained in:
Tristan 2024-03-02 10:32:38 +00:00
commit bdf83a61f6
5 changed files with 98 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

113
flake.lock generated
View file

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1689633990, "lastModified": 1708890466,
"narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", "rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707467182, "lastModified": 1709204054,
"narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,22 +241,25 @@
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs", "hyprlang": "hyprlang",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems", "systems": "systems",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1707098342, "lastModified": 1709080360,
"narHash": "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=", "narHash": "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "84ab8d11e8951a6551d1e1bf87796a8589da6d47", "rev": "1c460e98f870676b15871fe4e5bfeb1a32a3d6d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.35.0", "ref": "v0.36.0",
"repo": "Hyprland", "repo": "Hyprland",
"type": "github" "type": "github"
} }
@ -290,16 +293,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"xdph",
"nixpkgs" "nixpkgs"
],
"systems": [
"hyprland",
"systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1704287638, "lastModified": 1709082138,
"narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", "narHash": "sha256-upV2PWOoQ5hKbeuMwiJ4RJUa1JDVqzxdr5LL7YJJ/f4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", "rev": "42c66f6b44eb9ac64af9b6ef26325c16909a7650",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,27 +316,26 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706191920, "lastModified": 1709150264,
"narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1708210246, "lastModified": 1708819810,
"narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,26 +347,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1707268954, "lastModified": 1708751719,
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1708151420,
"narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6e2f00c83911461438301db0dba5281197fe4b3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,7 +361,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1700856099, "lastModified": 1700856099,
"narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
@ -391,7 +381,7 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stable-nixpkgs": "stable-nixpkgs", "stable-nixpkgs": "stable-nixpkgs",
"stylix": "stylix" "stylix": "stylix"
@ -399,15 +389,15 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1708500294, "lastModified": 1708987867,
"narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -418,11 +408,11 @@
}, },
"stable-nixpkgs": { "stable-nixpkgs": {
"locked": { "locked": {
"lastModified": 1707347730, "lastModified": 1709218635,
"narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", "narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", "rev": "068d4db604958d05d0b46c47f79b507d84dbc069",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -445,14 +435,14 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1707492526, "lastModified": 1708896938,
"narHash": "sha256-i87wM/l56Hrvmr5D41+S7lL0uWBDHQUJGp3dVzKNQXM=", "narHash": "sha256-oMjkMjeNhDUEpKIofo9+9RdUnmmZ4h0sm+kf6XKdy6k=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "b17c41ca43866609579ea9c9ef96532d8854b85f", "rev": "fcff15ac5ffbe81f1c66e352f3167c270d79cdab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -480,18 +470,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1706359063, "lastModified": 1708558866,
"narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -501,7 +491,10 @@
"hyprland", "hyprland",
"hyprland-protocols" "hyprland-protocols"
], ],
"hyprlang": "hyprlang", "hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"

11
flake.nix
View file

@ -9,16 +9,16 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
hyprland.url = "github:hyprwm/Hyprland/v0.35.0"; hyprland = {
url = "github:hyprwm/Hyprland/v0.36.0";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
}; };
outputs = inputs: let outputs = inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs { inherit system; };
inherit system;
overlays = [inputs.hyprland.overlays];
};
user = "tristan"; user = "tristan";
userFullname = "Tristan Beedell"; userFullname = "Tristan Beedell";
auto-login = import ./nixos/programs/auto-login.nix; auto-login = import ./nixos/programs/auto-login.nix;
@ -29,6 +29,7 @@
nixosConfigurations = { nixosConfigurations = {
zenix = zenix =
mkConf [ mkConf [
inputs.hyprland.nixosModules.default
./hardware/zenix.nix ./hardware/zenix.nix
(auto-login "Hyprland") (auto-login "Hyprland")
./nixos/programs/gamer.nix ./nixos/programs/gamer.nix

9
home/desktop/hyprland/default.nix
View file

@ -33,10 +33,6 @@ in {
kb_layout = lib.mkDefault "gb"; kb_layout = lib.mkDefault "gb";
numlock_by_default = true; numlock_by_default = true;
}; };
"device:zsa-technology-labs-moonlander-mark-i" = {
kb_variant = "";
kb_options = "esperanto:qwerty,lv3:ralt_switch";
};
gestures = { gestures = {
workspace_swipe = true; workspace_swipe = true;
workspace_swipe_numbered = false; workspace_swipe_numbered = false;
@ -186,6 +182,11 @@ in {
bind = SUPER, escape, submap, reset bind = SUPER, escape, submap, reset
submap = reset submap = reset
device {
name = zsa-technology-labs-moonlander-mark-i
kb_variant =
kb_options = esperanto:qwerty,lv3:ralt_switch
}
''; '';
}; };

6
home/programs/personal/default.nix
View file

@ -1,6 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [ imports = [
./kodi.nix # ./kodi.nix
]; ];
roles.email = { roles.email = {
enable = true; enable = true;
@ -12,11 +12,13 @@
base = "eo.UTF-8"; base = "eo.UTF-8";
}; };
services.nextcloud-client.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
godot_4 godot_4
ardour ardour
blender blender
musescore # musescore
jellyfin-media-player jellyfin-media-player
monero-gui monero-gui
electrum electrum

30
home/programs/xr.nix Normal file
View file

@ -0,0 +1,30 @@
{pkgs, config, ...}: {
home.packages = with pkgs; [
monado
];
home.file.".config/openxr/1/openxr_monado.json" = {
source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
};
home.file.".config/openvr/openvrpaths.vrpath" = {
text = ''
{
"config" :
[
"${config.home.homeDirectory}/.local/share/Steam/config"
],
"external_drivers" : null,
"jsonid" : "vrpathreg",
"log" :
[
"${config.home.homeDirectory}/.local/share/Steam/logs"
],
"runtime" :
[
"${pkgs.opencomposite}/lib/opencomposite"
],
"version" : 1
}
'';
};
}