diff --git a/flake.lock b/flake.lock index e69f9f6..89f9b0e 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1715593316, - "narHash": "sha256-S7XatU9uV3q9bVBcg/ER0VMQcnPZprrVlN209ne7LDw=", + "lastModified": 1717507522, + "narHash": "sha256-yE/djn0anGdWQ2yfiE8m82VXvWwB0+CIgEvjW8GfGlc=", "owner": "cachix", "repo": "devenv", - "rev": "725c90407ef53cc2a1b53701c6d2d0745cf2484f", + "rev": "8485851fadfce27d394fabbc4ccb679c84f8c0dc", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -263,12 +263,15 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_5" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -307,11 +310,11 @@ ] }, "locked": { - "lastModified": 1715211201, - "narHash": "sha256-WsoNDwmY3L1rN1/xw6P7NBjIqr+PJi8hrkpv82BDZe8=", + "lastModified": 1717093333, + "narHash": "sha256-D050npC0XbDiNPB1xUOzUNLSp0JyUUl015WEA0h8yf4=", "owner": "tailscale", "repo": "golink", - "rev": "55a3c6e2fe19671ca82f92cc85882f530440608d", + "rev": "ef8d461b8546ca45079254d134af2d15ad03ea61", "type": "github" }, "original": { @@ -348,11 +351,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1717483170, + "narHash": "sha256-Xr/oYk3vmyv2a/nY8o/Wd0MdLsI5vaC38Kris7CWunM=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "2cacdd6a27477f1fa46b7026dd806de30f164d3b", "type": "github" }, "original": { @@ -548,11 +551,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -563,16 +566,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702350026, - "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", + "lastModified": 1708161998, + "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9463103069725474698139ab10f17a9d125da859", + "rev": "84d981bae8b5e783b3b548de505b22880559515f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -702,6 +705,21 @@ "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": { "inputs": { "flake-compat": "flake-compat_3", @@ -709,11 +727,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715775020, - "narHash": "sha256-CCqc3c3yvXgRaTW18epSHlF2HeikwNXqxnlrRs2sl3Y=", + "lastModified": 1717502981, + "narHash": "sha256-Py7mS1iF3JnoGs02rIoMmxovIhOMvwzHOBQ1CTZChi0=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "03303bf01701b04ec87c55ce5d8d6f5ecf86d0a7", + "rev": "d4df06912c76c4b72c49fc938e29f7f235b8fd69", "type": "github" }, "original": { diff --git a/hosts/sidon/configuration.nix b/hosts/sidon/configuration.nix index cf3ff54..d0cc7b9 100644 --- a/hosts/sidon/configuration.nix +++ b/hosts/sidon/configuration.nix @@ -4,6 +4,7 @@ { config, pkgs, + lib, ... }: { imports = [ @@ -15,6 +16,8 @@ (import ../../modules).sidon ]; + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_6_8; + services.xserver = { dpi = 144; videoDrivers = ["nvidia"]; @@ -33,6 +36,8 @@ efiSupport = true; }; + boot.kernelParams = ["initcall_blacklist=simpledrm_platform_driver_init"]; + time.hardwareClockInLocalTime = true; environment.sessionVariables.NIXOS_OZONE_WL = "1"; @@ -45,8 +50,12 @@ enable = true; }; + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; hardware.nvidia.modesetting.enable = true; + hardware.opengl.enable = true; + hardware.opengl.driSupport = true; + networking.hostName = "sidon"; # Define your hostname. # This value determines the NixOS release from which the default diff --git a/users/configs/desktop/default.nix b/users/configs/desktop/default.nix index a4f7f97..de217dc 100644 --- a/users/configs/desktop/default.nix +++ b/users/configs/desktop/default.nix @@ -1,6 +1,6 @@ {config, ...}: { imports = [ - # ./i3 + ./i3 # ./i3status-rust # ./polybar ./hyprland diff --git a/users/configs/desktop/i3/default.nix b/users/configs/desktop/i3/default.nix index e8e0ca6..5327d69 100644 --- a/users/configs/desktop/i3/default.nix +++ b/users/configs/desktop/i3/default.nix @@ -64,7 +64,7 @@ in { fonts = { 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"; } ]; @@ -205,14 +205,14 @@ in { modifier = mod; startup = [ - { - command = "$HOME/bin/scripts/flower"; - always = true; - } - { - command = "feh --bg-fill $HOME/wallpapers/wallpaper.jpg"; - always = false; - } + # { + # command = "$HOME/bin/scripts/flower"; + # always = true; + # } + # { + # command = "feh --bg-fill $HOME/wallpapers/wallpaper.jpg"; + # always = false; + # } ]; terminal = "kitty"; diff --git a/users/configs/desktop/river/default.nix b/users/configs/desktop/river/default.nix index e92a2e3..a835f56 100644 --- a/users/configs/desktop/river/default.nix +++ b/users/configs/desktop/river/default.nix @@ -9,7 +9,7 @@ wlr-randr ]; wayland.windowManager.river = { - enable = true; + enable = false; package = pkgs.river.overrideAttrs (finalAttrs: previousAttrs: { version = "2024-11-04"; diff --git a/users/configs/desktop/sway/default.nix b/users/configs/desktop/sway/default.nix index 8457f9b..4c46322 100644 --- a/users/configs/desktop/sway/default.nix +++ b/users/configs/desktop/sway/default.nix @@ -30,6 +30,19 @@ in { }; wayland.windowManager.sway = { 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 = { bars = [ { @@ -88,11 +101,22 @@ in { eDP-1 = { scale = "1.33"; }; + + DP-2 = { + position = "0 0"; + scale = "1.33"; + }; + HDMI-A-2 = { + scale = "1.33"; + }; }; keybindings = { "${mod}+Return" = "exec kitty"; "${mod}+q" = "${closer}/bin/closer"; "${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}+j" = "focus down";