cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

move hypr

Browse Source
This commit is contained in:
cnst
2024-07-02 16:50:52 +02:00
parent ffb53bf615
commit 661e03b4f4
10 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
flake.lock generated
View File

@@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719836950, "lastModified": 1719923187,
"narHash": "sha256-dZaM7Xeogtf+zIT6tEP9UIxkO4VALLU6wQEdEINFl/s=", "narHash": "sha256-833SF50YnN1Hj3qdUmadt9A7XtFWG3BnwQMyxcXIex4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-firefox-nightly", "repo": "flake-firefox-nightly",
"rev": "81442b605dcbb9838b1a6c84b44b2643331c16b3", "rev": "9e77774f2eeab583dbff4127a11287061a947538",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -153,11 +153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1719877454,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -316,11 +316,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1719681865, "lastModified": 1719895800,
"narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=", "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -443,11 +443,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719764240, "lastModified": 1719913883,
"narHash": "sha256-bsZDPD08s8FKCGyy1OMMuM+cOjO1M8vPREkhgyqkRQM=", "narHash": "sha256-GHB5lizmXGlglKYAKIvY9bkPcXvbrmEzh4d264omYYo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "643ec69ac0cfcc1cd26523c3816fb111e5bb3a41", "rev": "0289cf03e294270c84f20bc09cd527fd7f3d4b72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -459,11 +459,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719700831, "lastModified": 1719827289,
"narHash": "sha256-d89hDFBBtuQ7rwS/Q3lKYyfE0ekVCwubMN9q1qCZ3m0=", "narHash": "sha256-0IcxmkzmNY4el9yx7wGjZ+VDLGV+3XlI6AW9WfCbzAM=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "e7020306a19a5211c834966ec067fff3b981bdb9", "rev": "8f5e90811025bcc652146168d5116f8d73fe8f81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -521,11 +521,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1719707984, "lastModified": 1719838683,
"narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=", "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7dca15289a1c2990efbe4680f0923ce14139b042", "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -537,11 +537,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719690277, "lastModified": 1719848872,
"narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
home/core/cnst.nix
View File

@@ -3,12 +3,6 @@
BROWSER = "firefox"; BROWSER = "firefox";
EDITOR = "nvim"; EDITOR = "nvim";
TERM = "kitty"; TERM = "kitty";
AMD_VULKAN_ICD = "RADV";
NIXOS_OZONE_WL = 1;
SDL_VIDEODRIVER = "wayland";
QT_QPA_PLATFORM = "wayland";
XDG_SESSION_TYPE = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
}; };
imports = [ imports = [
./git ./git

13
home/core/gui/default.nix
View File

@@ -25,18 +25,5 @@
gnome.gnome-calculator gnome.gnome-calculator
]; ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true;
package = pkgs.hyprland;
xwayland.enable = true;
extraConfig = ''
${builtins.readFile ./hyprland.conf}
'';
systemd = {
enable = true;
extraCommands = [
"systemctl --user stop graphical-session.target"
"systemctl --user start hyprland-session.target"
];
};
}; };
} }

2
home/core/shell/cnst.nix
View File

@@ -10,7 +10,9 @@
nixconfig = "cd /home/cnst/.nix-config/"; nixconfig = "cd /home/cnst/.nix-config/";
ll = "ls -l"; ll = "ls -l";
nixupdate = "sudo nixos-rebuild switch -v --show-trace --flake .#cnix"; nixupdate = "sudo nixos-rebuild switch -v --show-trace --flake .#cnix";
nixup = "sudo nixos-rebuild switch --flake .#cnix";
flakeupdate = "nix flake update"; flakeupdate = "nix flake update";
flakeup = "nix flake update";
}; };
history = { history = {
size = 1000; size = 1000;

6
hosts/core/cnix-pkgs.nix
View File

@@ -9,6 +9,12 @@
# Util # Util
pkgs.tmux pkgs.tmux
pkgs.tmuxifier pkgs.tmuxifier
# Misc
pkgs.protonup
]; ];
sessionVariables = {
STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d";
};
}; };
} }

1
hosts/core/default.nix
View File

@@ -11,6 +11,7 @@
./zsh.nix ./zsh.nix
./cnix-pkgs.nix ./cnix-pkgs.nix
./fonts.nix ./fonts.nix
./hyprland.nix
]; ];
home-manager = { home-manager = {
# useGlobalPkgs = true; # useGlobalPkgs = true;

7
hosts/core/hyprland.conf Normal file
View File

@@ -0,0 +1,7 @@
# HYPRLAND CONFIGURATION
source=./land/appearance.conf
source=./land/inputs.conf
source=./land/keybinds.conf
source=./land/rules.conf
source=./land/startup.conf

18
hosts/core/hyprland.nix
View File

@@ -3,5 +3,23 @@
enable = true; enable = true;
package = pkgs.hyprland; package = pkgs.hyprland;
xwayland.enable = true; xwayland.enable = true;
extraConfig = ''
${builtins.readFile ./hyprland.conf}
'';
systemd = {
enable = true;
extraCommands = [
"systemctl --user stop graphical-session.target"
"systemctl --user start hyprland-session.target"
];
};
};
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
AMD_VULKAN_ICD = "RADV";
SDL_VIDEODRIVER = "wayland";
QT_QPA_PLATFORM = "wayland";
XDG_SESSION_TYPE = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
}; };
} }

4
hosts/extra/steam/default.nix
View File

@@ -2,9 +2,7 @@
programs = { programs = {
steam = { steam = {
enable = true; enable = true;
extraCompatPackages = [ gamescopeSession.enable = true;
pkgs.proton-ge-bin
];
package = pkgs.steam.override { package = pkgs.steam.override {
extraPkgs = pkgs: extraPkgs = pkgs:
with pkgs; [ with pkgs; [

1
hosts/services/cnix.nix
View File

@@ -34,6 +34,7 @@
}; };
xserver = { xserver = {
enable = true; enable = true;
videoDrivers = ["amdgpu"];
xkb = { xkb = {
extraLayouts.hhkbse = { extraLayouts.hhkbse = {
description = "HHKBse by cnst"; description = "HHKBse by cnst";