From 8200fed53ff398b985e5871039d2d4d760355f81 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 25 Feb 2025 12:40:13 -0500 Subject: [PATCH] small tweaks --- flake.lock | 112 +++++++++++++++++----------------- hosts/eddie/configuration.nix | 88 ++++++++++++++------------ modules/home/emacs.nix | 5 +- modules/home/niri.nix | 3 +- 4 files changed, 107 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index 1c89351..709f228 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1740333969, - "narHash": "sha256-zkLwCGw1PylyV0cGywnYF/duox1gC45BcV5XtkXD6zM=", + "lastModified": 1740500634, + "narHash": "sha256-uCC1g2xo01Q9WS6ivR9iBqO+9baoaY5op6f1EZz46IE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "84420d1963cada13bc63be2e118082586690728a", + "rev": "d82d304bcd1398e223dee8de927db024dced5128", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1740344845, - "narHash": "sha256-5D9LkYjXu+jbdgzpr+jL5HTcH7ONMz6FChH1Nwudn48=", + "lastModified": 1740494361, + "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a2af4ffb26f812c353415c7316dff0a8b52b525", + "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1740330618, - "narHash": "sha256-83YE9x3TEKs2TvTmiQHursNXSuD8EF4pfBpaQ2x9/ec=", + "lastModified": 1740392231, + "narHash": "sha256-z9lyPSiuUAwu5bmZlcHj5SV3mHtP+GXtuEeJzOr1c9A=", "owner": "isd-project", "repo": "isd", - "rev": "ab27080178ec86c31a2232fba0289cf028aae0fd", + "rev": "51d52a24ecb4fdfdee88e660c4d725667bc8fdb6", "type": "github" }, "original": { @@ -711,11 +711,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740326457, - "narHash": "sha256-C1tiPRIXI6Z5vd3pz26/JQ/p+VaG2eKD6PNk8ZqFW1E=", + "lastModified": 1740480783, + "narHash": "sha256-5l/WnJ4BELbckzTd1rmTlEGbcqBf71K2tx6pCNb2xM8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "23b0234ac1b03709a0cec40e84d293f083859dc9", + "rev": "0da1abb83ef2a37fd885de79730759486a407c41", "type": "github" }, "original": { @@ -727,16 +727,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1736614405, - "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.01", + "ref": "v25.02", "repo": "niri", "type": "github" } @@ -744,11 +744,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740251548, - "narHash": "sha256-53kgDwNYEPIZadX5SEk7+OoTXycHm1QUF7x2XCoo9+U=", + "lastModified": 1740476031, + "narHash": "sha256-8YuYgIzExIAenYMaSQTP7zYBzaJPN83pGRrcwQCochY=", "owner": "YaLTeR", "repo": "niri", - "rev": "bca65452882e1e616045e21a0a9a4a0b7024239b", + "rev": "c153349c62ed44762bf2ae8be6d5812faa9d5c6d", "type": "github" }, "original": { @@ -834,11 +834,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1740387674, + "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", "type": "github" }, "original": { @@ -892,11 +892,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -908,11 +908,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -940,11 +940,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -956,11 +956,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -1004,11 +1004,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ ] }, "locked": { - "lastModified": 1737338290, - "narHash": "sha256-gnXlfFEHA+/jMH7R+7y3JxrI3WfOjgBhzzJNuFW70UU=", + "lastModified": 1740362541, + "narHash": "sha256-S8Mno07MspggOv/xIz5g8hB2b/C5HPiX8E+rXzKY+5U=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "e1487e5cefda0c7990bdd2e660bee20971680e45", + "rev": "e151741c848ba92331af91f4e47640a1fb82be19", "type": "github" }, "original": { @@ -1075,11 +1075,11 @@ ] }, "locked": { - "lastModified": 1738204167, - "narHash": "sha256-J5M2sj3x4ocM93shScT/3Z4XWHZhwwW1NyQK+C+8Mys=", + "lastModified": 1739758351, + "narHash": "sha256-Aoa4dEoC7Hf6+gFVk/SDquZTMFlmlfsgdTWuqQxzePs=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "0d9f4b90cee1b5c5d6c142ef22de1e246e003ccc", + "rev": "1329712f7f9af3a8b270764ba338a455b7323811", "type": "github" }, "original": { @@ -1310,11 +1310,11 @@ ] }, "locked": { - "lastModified": 1738200085, - "narHash": "sha256-Lwb86tkHoeJdjYaAHYZPkUZJoWXNHb5IQjzDyd4Vxno=", + "lastModified": 1740210290, + "narHash": "sha256-VXtF9oZsCmdSsRQjBOm5o0GLYE8Pp5rl7uYK+zV5a0c=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "fd41fdec2fed599ba884bc2706c2263f01e2183c", + "rev": "846ad27167bf6a855c56753ba8360759bfb6f456", "type": "github" }, "original": { @@ -1337,11 +1337,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1740317044, - "narHash": "sha256-s4D7XkF3IgxQWgXtPHe9FzRXKkakTNH2Utp7zNbPT2o=", + "lastModified": 1740350337, + "narHash": "sha256-Ue+ERNL8y9l/0BTay1/fm1V2zcKFf/dX5H1DHI2TO+w=", "owner": "wez", "repo": "wezterm", - "rev": "4ff581a8aa3460d04f859fdadb50f29b3c507763", + "rev": "fd532a8c2fb3b56593597cf8be1775da1feda0a3", "type": "github" }, "original": { @@ -1354,16 +1354,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1730166465, - "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5", + "ref": "v0.5.1", "repo": "xwayland-satellite", "type": "github" } @@ -1393,11 +1393,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1740328755, - "narHash": "sha256-HQLGiPAEiU8x41ePDFaMGN9BBZPLFf5aJnPhfzU30R8=", + "lastModified": 1740496374, + "narHash": "sha256-DJaJ4jAIex650tuoeudOVCBCfdT/3cZ7z/QJ7TpKI2c=", "owner": "sxyazi", "repo": "yazi", - "rev": "f11f77d7b97955b5a5c31e55ed231cbdca99f040", + "rev": "235f6888d467cbd469afe3da45ee048d9d38ee27", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index bc058fd..4eb845e 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -7,7 +7,6 @@ }: { - imports = with nix-config.nixosModules; [ ./hardware-configuration.nix ./razer-speaker-fix.nix @@ -30,20 +29,20 @@ inputs.emacs-lsp-booster.overlays.default (final: prev: { - wineWowPackages.stagingFull = nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs (old: { - patches = old.patches ++ [ ../../patches/wine-6006.patch ]; - waylandSupport = true; - fontconfigSupport = true; - vulkanSupport = true; - }); + wineWowPackages.stagingFull = + nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs + (old: { + patches = old.patches ++ [ ../../patches/wine-6006.patch ]; + waylandSupport = true; + fontconfigSupport = true; + vulkanSupport = true; + }); }) (final: prev: { - bitwig-studio5-3 = - nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override { - bitwig-studio = - nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped; - }; + bitwig-studio5-3 = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override { + bitwig-studio = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped; + }; }) ]; }; @@ -74,26 +73,29 @@ console = { earlySetup = true; - colors = with pkgs.lib.nix-rice; - let theme = palette.toRgbShortHex pkgs.rice.colorPalette; + colors = + with pkgs.lib.nix-rice; + let + theme = palette.toRgbShortHex pkgs.rice.colorPalette; in - with theme; [ - # normal.black - # normal.red - # normal.green - # normal.yellow - # normal.blue - # normal.magenta - # normal.cyan - # normal.white - # bright.black - # bright.red - # bright.green - # bright.yellow - # bright.blue - # bright.magenta - # bright.cyan - # bright.white + with theme; + [ + # normal.black + # normal.red + # normal.green + # normal.yellow + # normal.blue + # normal.magenta + # normal.cyan + # normal.white + # bright.black + # bright.red + # bright.green + # bright.yellow + # bright.blue + # bright.magenta + # bright.cyan + # bright.white "282c34" "e06c75" @@ -111,7 +113,7 @@ "c678dd" "56b6c2" "c8ccd4" - ]; + ]; }; environment.systemPackages = with pkgs; [ @@ -156,7 +158,13 @@ efi.canTouchEfiVariables = true; }; kernelPackages = pkgs.linuxPackages_latest; - kernelModules = [ "i2c-dev" "ddcci-backlight" "amd_3d_vcache" "uinput" "amd_pstate=active" ]; + kernelModules = [ + "i2c-dev" + "ddcci-backlight" + "amd_3d_vcache" + "uinput" + "amd_pstate=active" + ]; extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ]; initrd.systemd.enable = true; initrd.kernelModules = [ @@ -335,7 +343,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --greeting 'welcome >:o' --theme 'button=yellow'"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --greeting '<~welcome~>' --theme 'button=yellow'"; # --theme 'border=magenta;prompt=green;time=red;action=blue;button=yellow;container=black;input=red'"; user = "greeter"; }; @@ -417,12 +425,12 @@ environment.pathsToLink = [ "/share/fish" ]; programs.bash = { interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + ''; }; services.flatpak.enable = true; diff --git a/modules/home/emacs.nix b/modules/home/emacs.nix index 01663cd..b222275 100644 --- a/modules/home/emacs.nix +++ b/modules/home/emacs.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: let emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages ( epkgs: [ @@ -10,8 +10,6 @@ let epkgs.cider epkgs.editorconfig epkgs.shfmt - # epkgs.nixpkgs-fmt - # epkgs.nixfmt epkgs.apheleia epkgs.parinfer-rust-mode epkgs.manualPackages.tree-sitter-langs @@ -19,6 +17,7 @@ let epkgs.pretty-sha-path epkgs.pdf-tools epkgs.all-the-icons + epkgs.eldoc ] )); in { diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 1a6da9f..0424ed4 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -12,9 +12,8 @@ in { spawn-at-startup = [ { command = ["clipse" "-listen"]; } - { command = [ "${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; } - # { command = ["waybar"]; } { command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" ]; } + { command = [ "sleep5; ${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; } ]; workspaces = {