kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hyprland, fix nix-shell version and add firefox

Browse Source
This commit is contained in:
Kopatz
2023-12-13 21:28:14 +01:00
parent e71acbfbbf
commit b1c86299c3
7 changed files with 129 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
flake.lock generated
View File

@@ -76,7 +76,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
@@ -134,6 +134,55 @@
"type": "github" "type": "github"
} }
}, },
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": [
"nixpkgs-unstable"
],
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1702488319,
"narHash": "sha256-goxBCjjWitvx2Oq4AihpA2OhYEirolMLC48fdA7Iey8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "01e5c59d752d3fe7fa484330fa48e010054b8fa1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"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"
}
},
"nix-colors": { "nix-colors": {
"inputs": { "inputs": {
"base16-schemes": "base16-schemes", "base16-schemes": "base16-schemes",
@@ -291,6 +340,7 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@@ -300,6 +350,21 @@
} }
}, },
"systems": { "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"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -313,6 +378,54 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1701368958,
"narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1702334919,
"narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

7
flake.nix
View File

@@ -16,6 +16,10 @@
}; };
nixinate.url = "github:matthewcroughan/nixinate"; nixinate.url = "github:matthewcroughan/nixinate";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs-unstable"; # MESA/OpenGL HW workaround
};
}; };
outputs = { self, outputs = { self,
nixpkgs, nixpkgs,
@@ -26,6 +30,7 @@
home-manager, home-manager,
nixinate, nixinate,
nix-colors, nix-colors,
hyprland,
}@inputs: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
@@ -105,6 +110,7 @@
./users/kopatz ./users/kopatz
### System modules ### ### System modules ###
./modules/graphical/plasma.nix ./modules/graphical/plasma.nix
hyprland.nixosModules.default
./modules/graphical/hyprland.nix ./modules/graphical/hyprland.nix
./modules/graphical/emulators.nix ./modules/graphical/emulators.nix
./modules/graphical/gamemode.nix ./modules/graphical/gamemode.nix
@@ -147,6 +153,7 @@
./users/kopatz ./users/kopatz
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
# Todo: refactor file layout # Todo: refactor file layout
hyprland.nixosModules.default
./modules/graphical/hyprland.nix ./modules/graphical/hyprland.nix
./modules/graphical/shared.nix ./modules/graphical/shared.nix
./laptop/configuration.nix ./laptop/configuration.nix

1
modules/cli-tools.nix
View File

@@ -17,6 +17,5 @@
ffmpeg ffmpeg
nethogs nethogs
dig dig
nss-tools
]; ];
} }

2
modules/graphical/hyprland.nix
View File

@@ -1,7 +1,7 @@
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
let let
patchedWaybar = pkgs.waybar.overrideAttrs (oldAttrs: { patchedWaybar = pkgs.unstable.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
}); });

1
modules/graphical/shared.nix
View File

@@ -17,6 +17,7 @@ in
fonts.fontDir.enable = true; fonts.fontDir.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
corefonts
nerdfonts nerdfonts
noto-fonts noto-fonts
noto-fonts-emoji noto-fonts-emoji

4
modules/nix/settings.nix
View File

@@ -1,4 +1,8 @@
{ inputs, config, ... }:
{ {
nix.optimise.automatic = true; nix.optimise.automatic = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.registry.nixpkgs.flake = inputs.nixpkgs;
nix.nixPath = ["nixpkgs=flake:nixpkgs"];
home-manager.users.${config.mainUser.name}.home.sessionVariables.NIX_PATH = "nixpkgs=flake:nixpkgs$\{NIX_PATH:+:$NIX_PATH}";
} }

2
users/kopatz/default.nix
View File

@@ -20,7 +20,7 @@
extraGroups = [ "networkmanager" "wheel" "docker" ]; extraGroups = [ "networkmanager" "wheel" "docker" ];
packages = with pkgs; [ packages = with pkgs; [
(discord.override { withVencord = true; }) (discord.override { withVencord = true; })
librewolf firefox
brave brave
]; ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [