dp/nixcfg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

t

Browse Source
This commit is contained in:
Daniel Patterson
2024-06-11 17:11:49 +01:00
parent d7549af76f
commit 3b6a816df6
6 changed files with 90 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
flake.lock generated
View File

@@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1715290355, "lastModified": 1716561646,
"narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -86,11 +86,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1715593316, "lastModified": 1717507522,
"narHash": "sha256-S7XatU9uV3q9bVBcg/ER0VMQcnPZprrVlN209ne7LDw=", "narHash": "sha256-yE/djn0anGdWQ2yfiE8m82VXvWwB0+CIgEvjW8GfGlc=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "725c90407ef53cc2a1b53701c6d2d0745cf2484f", "rev": "8485851fadfce27d394fabbc4ccb679c84f8c0dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -165,11 +165,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -263,12 +263,15 @@
} }
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": {
"systems": "systems_5"
},
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1705309234,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -307,11 +310,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715211201, "lastModified": 1717093333,
"narHash": "sha256-WsoNDwmY3L1rN1/xw6P7NBjIqr+PJi8hrkpv82BDZe8=", "narHash": "sha256-D050npC0XbDiNPB1xUOzUNLSp0JyUUl015WEA0h8yf4=",
"owner": "tailscale", "owner": "tailscale",
"repo": "golink", "repo": "golink",
"rev": "55a3c6e2fe19671ca82f92cc85882f530440608d", "rev": "ef8d461b8546ca45079254d134af2d15ad03ea61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -348,11 +351,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715486357, "lastModified": 1717483170,
"narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "narHash": "sha256-Xr/oYk3vmyv2a/nY8o/Wd0MdLsI5vaC38Kris7CWunM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "rev": "2cacdd6a27477f1fa46b7026dd806de30f164d3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -548,11 +551,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1715787315, "lastModified": 1717196966,
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -563,16 +566,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1702350026, "lastModified": 1708161998,
"narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9463103069725474698139ab10f17a9d125da859", "rev": "84d981bae8b5e783b3b548de505b22880559515f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -702,6 +705,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"zig": { "zig": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@@ -709,11 +727,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1715775020, "lastModified": 1717502981,
"narHash": "sha256-CCqc3c3yvXgRaTW18epSHlF2HeikwNXqxnlrRs2sl3Y=", "narHash": "sha256-Py7mS1iF3JnoGs02rIoMmxovIhOMvwzHOBQ1CTZChi0=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "03303bf01701b04ec87c55ce5d8d6f5ecf86d0a7", "rev": "d4df06912c76c4b72c49fc938e29f7f235b8fd69",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
hosts/sidon/configuration.nix
View File

@@ -4,6 +4,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: { }: {
imports = [ imports = [
@@ -15,6 +16,8 @@
(import ../../modules).sidon (import ../../modules).sidon
]; ];
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_6_8;
services.xserver = { services.xserver = {
dpi = 144; dpi = 144;
videoDrivers = ["nvidia"]; videoDrivers = ["nvidia"];
@@ -33,6 +36,8 @@
efiSupport = true; efiSupport = true;
}; };
boot.kernelParams = ["initcall_blacklist=simpledrm_platform_driver_init"];
time.hardwareClockInLocalTime = true; time.hardwareClockInLocalTime = true;
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";
@@ -45,8 +50,12 @@
enable = true; enable = true;
}; };
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
hardware.nvidia.modesetting.enable = true; hardware.nvidia.modesetting.enable = true;
hardware.opengl.enable = true;
hardware.opengl.driSupport = true;
networking.hostName = "sidon"; # Define your hostname. networking.hostName = "sidon"; # Define your hostname.
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default

2
users/configs/desktop/default.nix
View File

@@ -1,6 +1,6 @@
{config, ...}: { {config, ...}: {
imports = [ imports = [
# ./i3 ./i3
# ./i3status-rust # ./i3status-rust
# ./polybar # ./polybar
./hyprland ./hyprland

18
users/configs/desktop/i3/default.nix
View File

@@ -64,7 +64,7 @@ in {
fonts = { fonts = {
size = 11.0; size = 11.0;
}; };
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs /home/daniel/.config/i3status-rust/config-main.toml"; # statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs /home/daniel/.config/i3status-rust/config-main.toml";
position = "top"; position = "top";
} }
]; ];
@@ -205,14 +205,14 @@ in {
modifier = mod; modifier = mod;
startup = [ startup = [
{ # {
command = "$HOME/bin/scripts/flower"; # command = "$HOME/bin/scripts/flower";
always = true; # always = true;
} # }
{ # {
command = "feh --bg-fill $HOME/wallpapers/wallpaper.jpg"; # command = "feh --bg-fill $HOME/wallpapers/wallpaper.jpg";
always = false; # always = false;
} # }
]; ];
terminal = "kitty"; terminal = "kitty";

2
users/configs/desktop/river/default.nix
View File

@@ -9,7 +9,7 @@
wlr-randr wlr-randr
]; ];
wayland.windowManager.river = { wayland.windowManager.river = {
enable = true; enable = false;
package = pkgs.river.overrideAttrs (finalAttrs: previousAttrs: { package = pkgs.river.overrideAttrs (finalAttrs: previousAttrs: {
version = "2024-11-04"; version = "2024-11-04";

24
users/configs/desktop/sway/default.nix
View File

@@ -30,6 +30,19 @@ in {
}; };
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
extraOptions = [
"--unsupported-gpu"
];
checkConfig = false;
extraSessionCommands = ''
export WLR_RENDERER=vulkan
export WLR_NO_HARDWARE_CURSORS=1
export XWAYLAND_NO_GLAMOR=1
export LIBVA_DRIVER_NAME=nvidia
export XDG_SESSION_TYPE=wayland
export GBM_BACKEND=nvidia-drm
export __GLX_VENDOR_LIBRARY_NAME=nvidia
'';
config = { config = {
bars = [ bars = [
{ {
@@ -88,11 +101,22 @@ in {
eDP-1 = { eDP-1 = {
scale = "1.33"; scale = "1.33";
}; };
DP-2 = {
position = "0 0";
scale = "1.33";
};
HDMI-A-2 = {
scale = "1.33";
};
}; };
keybindings = { keybindings = {
"${mod}+Return" = "exec kitty"; "${mod}+Return" = "exec kitty";
"${mod}+q" = "${closer}/bin/closer"; "${mod}+q" = "${closer}/bin/closer";
"${mod}+d" = "exec tofi-drun --drun-launch=true"; "${mod}+d" = "exec tofi-drun --drun-launch=true";
"${hyper}+Return" = "exec kitty";
"${hyper}+q" = "${closer}/bin/closer";
"${hyper}+d" = "exec tofi-drun --drun-launch=true";
"${mod}+h" = "focus left"; "${mod}+h" = "focus left";
"${mod}+j" = "focus down"; "${mod}+j" = "focus down";