diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 31ff7e0..ebc0ff0 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -37,6 +37,7 @@ # kernel options boot = { kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages; kernel.sysctl = { # dmesg shushhhhh diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index c23127e..274e694 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1731678403, - "narHash": "sha256-kcsXMNjQQK3hgUBaH9JoyHyESRvDhFV7L0GqVha3C40=", + "lastModified": 1732400024, + "narHash": "sha256-uf1QzIl0Jj5dr7+erWjHWiCUEvywLaR7ir1jcqGgjeQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d9d59a2819215227199b5eeab06a7e5fb56681f7", + "rev": "376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1731535640, - "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1731227601, - "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", + "lastModified": 1732032028, + "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", + "rev": "65dc04371cf914c9af4f073638821e4787303005", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730739295, - "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", + "lastModified": 1731941836, + "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "cef39a78679c266300874e7a7000b4da066228d4", + "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731740897, - "narHash": "sha256-teFd31vsE/0Z0WR6XVeKhKPw6Eyb2gXGpG0tjpMfBDM=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c2c275fbb2e656948ba6e1f67b8ddd430f158c5f", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1731261253, - "narHash": "sha256-1PbE3SspU7JNWxPPnedMbdQAHJEpgU6dbC7HOqhQ0lM=", + "lastModified": 1732308363, + "narHash": "sha256-o/qgBWJ1JSeWvdcTqdqMDttoggejk25UnzHiaGrfZUU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4af0971e2827ed49e0322850ec3d1b0b449558b", + "rev": "5c37b4d31e8531260cfe3d80a39cd9d62ecb547b", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index c693ba9..6d6204f 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1731778696, - "narHash": "sha256-qQYeHamLt0z00G5MTSSxaTw/9zGdebEeYj4MDL+nOCI=", + "lastModified": 1732397793, + "narHash": "sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF+5mroU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d154a557da07645aaea3b3375317c234cf2eed82", + "rev": "92fef254a9071fa41a13908281284e6a62b9c92e", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1731726258, - "narHash": "sha256-hCybwO9VTRC34wG/dE7trehhAkNI0abuQYEd3ebOXgw=", + "lastModified": 1732366896, + "narHash": "sha256-dQrHznGma8aWeBESRUCc1onWYoGrM35GDl/uwEB7eG8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fa219c123e66b7812748a8c380770b7b714bf29", + "rev": "3131d857c946c75557f5b6fb99a113b6949ea04d", "type": "github" }, "original": { @@ -95,16 +95,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1731164272, - "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", + "lastModified": 1731483594, + "narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=", "owner": "YaLTeR", "repo": "niri", - "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", + "rev": "75c79116a7e40cbc0e110ce0cdd500e896458679", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v0.1.10", + "ref": "v0.1.10.1", "repo": "niri", "type": "github" } @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1731575130, - "narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=", + "lastModified": 1732363756, + "narHash": "sha256-/E2aRhcvlH2PkkpC2n79UCMZyIkQKWfG4m//UHkeNgU=", "owner": "YaLTeR", "repo": "niri", - "rev": "1a0612cbfd0abee0796efa86470226686ae78f21", + "rev": "9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731652201, - "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1731724228, - "narHash": "sha256-3R48B+BVeZ8IWsXF7TdRm441RsdJt21yQ5ZgxuNTXYc=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f6c4c2a7b8969c2b172847b3ef474e0d3bd8bdce", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1731123454, - "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", + "lastModified": 1732233710, + "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", + "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 9237602..32206f0 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -60,7 +60,6 @@ mpv mumble system76-keyboard-configurator - mission-center #jellyfin finamp # music player @@ -96,8 +95,28 @@ puddletag epiphany + + mcaselector ]; + programs.zed-editor = { + enable = true; + userSettings = { + ui_font_size = 16; + buffer_font_size = 16; + theme = { + mode = "system"; + light = "Gruvbox Dark Hard"; + dark = "One Dark"; + }; + }; + extensions = [ + "nix" + "sql" + "CSV" + ]; + }; + # make chromium-based stuff use wayland home.file.".config/chromium-flags.conf".text = "--ozone-platform-hint=auto"; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 5162b14..7677b86 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -13,6 +13,7 @@ ]; home.stateVersion = "24.11"; + home.enableNixpkgsReleaseCheck = false; home.packages = with pkgs; [ # hex viewer diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 083aaa9..d28e532 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -6,13 +6,13 @@ }: { programs.niri = { - package = pkgs.niri-unstable; + package = pkgs.niri-stable; settings = { prefer-no-csd = true; - # environment = { - # DISPLAY = ":0"; - # }; + environment = { + DISPLAY = ":0"; + }; # skip the hotkey menu thingy hotkey-overlay.skip-at-startup = true; @@ -54,13 +54,13 @@ ]; } - # { - # command = [ - # "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" - # # (builtins.toString config.programs.niri.settings.environment.DISPLAY) - # ":0" - # ]; - # } + { + command = [ + "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" + # (builtins.toString config.programs.niri.settings.environment.DISPLAY) + ":0" + ]; + } ]; window-rules = [ @@ -88,9 +88,7 @@ binds = with config.lib.niri.actions; { # Application launcher "Mod+Space".action = spawn [ - "${pkgs.rofi-wayland}/bin/rofi" - "-show" - "combi" + "${pkgs.fuzzel}/bin/fuzzel" ]; # open a terminal diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 778fd90..e20c30d 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -28,6 +28,8 @@ # used by /etc/nixos logic to launch niri config.programs.niri.package + + xwayland-satellite-unstable ]; services.blueman-applet.enable = true; @@ -49,16 +51,6 @@ package = pkgs.dunst; }; - # rofi for application launcher - programs.rofi = { - enable = true; - package = pkgs.rofi-wayland; - extraConfig = { - modi = "window,drun,ssh,combi"; - combi-modi = "window,drun,ssh"; - }; - }; - age.secrets.borg-laptop-password = { file = ./secrets/borg-laptop-password.age; path = "${homeDirectory}/.secrets/borg_bak_pass";