emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

small tweaks

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-02-25 12:40:13 -05:00
parent d90c80b61e
commit 8200fed53f
4 changed files with 107 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

112
flake.lock generated
View file

@ -68,11 +68,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1740333969, "lastModified": 1740500634,
"narHash": "sha256-zkLwCGw1PylyV0cGywnYF/duox1gC45BcV5XtkXD6zM=", "narHash": "sha256-uCC1g2xo01Q9WS6ivR9iBqO+9baoaY5op6f1EZz46IE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "84420d1963cada13bc63be2e118082586690728a", "rev": "d82d304bcd1398e223dee8de927db024dced5128",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +322,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740344845, "lastModified": 1740494361,
"narHash": "sha256-5D9LkYjXu+jbdgzpr+jL5HTcH7ONMz6FChH1Nwudn48=", "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6a2af4ffb26f812c353415c7316dff0a8b52b525", "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -611,11 +611,11 @@
"uv2nix": "uv2nix" "uv2nix": "uv2nix"
}, },
"locked": { "locked": {
"lastModified": 1740330618, "lastModified": 1740392231,
"narHash": "sha256-83YE9x3TEKs2TvTmiQHursNXSuD8EF4pfBpaQ2x9/ec=", "narHash": "sha256-z9lyPSiuUAwu5bmZlcHj5SV3mHtP+GXtuEeJzOr1c9A=",
"owner": "isd-project", "owner": "isd-project",
"repo": "isd", "repo": "isd",
"rev": "ab27080178ec86c31a2232fba0289cf028aae0fd", "rev": "51d52a24ecb4fdfdee88e660c4d725667bc8fdb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -711,11 +711,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1740326457, "lastModified": 1740480783,
"narHash": "sha256-C1tiPRIXI6Z5vd3pz26/JQ/p+VaG2eKD6PNk8ZqFW1E=", "narHash": "sha256-5l/WnJ4BELbckzTd1rmTlEGbcqBf71K2tx6pCNb2xM8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "23b0234ac1b03709a0cec40e84d293f083859dc9", "rev": "0da1abb83ef2a37fd885de79730759486a407c41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -727,16 +727,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736614405, "lastModified": 1740117926,
"narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=", "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5", "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v25.01", "ref": "v25.02",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -744,11 +744,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740251548, "lastModified": 1740476031,
"narHash": "sha256-53kgDwNYEPIZadX5SEk7+OoTXycHm1QUF7x2XCoo9+U=", "narHash": "sha256-8YuYgIzExIAenYMaSQTP7zYBzaJPN83pGRrcwQCochY=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "bca65452882e1e616045e21a0a9a4a0b7024239b", "rev": "c153349c62ed44762bf2ae8be6d5812faa9d5c6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -834,11 +834,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1740089251, "lastModified": 1740387674,
"narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -892,11 +892,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1740162160, "lastModified": 1740339700,
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -908,11 +908,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1740162160, "lastModified": 1740339700,
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -940,11 +940,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1740162160, "lastModified": 1740339700,
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -956,11 +956,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1740126099, "lastModified": 1740367490,
"narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1004,11 +1004,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1740126099, "lastModified": 1740367490,
"narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1054,11 +1054,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737338290, "lastModified": 1740362541,
"narHash": "sha256-gnXlfFEHA+/jMH7R+7y3JxrI3WfOjgBhzzJNuFW70UU=", "narHash": "sha256-S8Mno07MspggOv/xIz5g8hB2b/C5HPiX8E+rXzKY+5U=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "build-system-pkgs", "repo": "build-system-pkgs",
"rev": "e1487e5cefda0c7990bdd2e660bee20971680e45", "rev": "e151741c848ba92331af91f4e47640a1fb82be19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1075,11 +1075,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738204167, "lastModified": 1739758351,
"narHash": "sha256-J5M2sj3x4ocM93shScT/3Z4XWHZhwwW1NyQK+C+8Mys=", "narHash": "sha256-Aoa4dEoC7Hf6+gFVk/SDquZTMFlmlfsgdTWuqQxzePs=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "pyproject.nix", "repo": "pyproject.nix",
"rev": "0d9f4b90cee1b5c5d6c142ef22de1e246e003ccc", "rev": "1329712f7f9af3a8b270764ba338a455b7323811",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1310,11 +1310,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738200085, "lastModified": 1740210290,
"narHash": "sha256-Lwb86tkHoeJdjYaAHYZPkUZJoWXNHb5IQjzDyd4Vxno=", "narHash": "sha256-VXtF9oZsCmdSsRQjBOm5o0GLYE8Pp5rl7uYK+zV5a0c=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "uv2nix", "repo": "uv2nix",
"rev": "fd41fdec2fed599ba884bc2706c2263f01e2183c", "rev": "846ad27167bf6a855c56753ba8360759bfb6f456",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1337,11 +1337,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1740317044, "lastModified": 1740350337,
"narHash": "sha256-s4D7XkF3IgxQWgXtPHe9FzRXKkakTNH2Utp7zNbPT2o=", "narHash": "sha256-Ue+ERNL8y9l/0BTay1/fm1V2zcKFf/dX5H1DHI2TO+w=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "4ff581a8aa3460d04f859fdadb50f29b3c507763", "rev": "fd532a8c2fb3b56593597cf8be1775da1feda0a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1354,16 +1354,16 @@
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730166465, "lastModified": 1739246919,
"narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Supreeeme", "owner": "Supreeeme",
"ref": "v0.5", "ref": "v0.5.1",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
@ -1393,11 +1393,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1740328755, "lastModified": 1740496374,
"narHash": "sha256-HQLGiPAEiU8x41ePDFaMGN9BBZPLFf5aJnPhfzU30R8=", "narHash": "sha256-DJaJ4jAIex650tuoeudOVCBCfdT/3cZ7z/QJ7TpKI2c=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "f11f77d7b97955b5a5c31e55ed231cbdca99f040", "rev": "235f6888d467cbd469afe3da45ee048d9d38ee27",
"type": "github" "type": "github"
}, },
"original": { "original": {

88
hosts/eddie/configuration.nix
View file

@ -7,7 +7,6 @@
}: }:
{ {
imports = with nix-config.nixosModules; [ imports = with nix-config.nixosModules; [
./hardware-configuration.nix ./hardware-configuration.nix
./razer-speaker-fix.nix ./razer-speaker-fix.nix
@ -30,20 +29,20 @@
inputs.emacs-lsp-booster.overlays.default inputs.emacs-lsp-booster.overlays.default
(final: prev: { (final: prev: {
wineWowPackages.stagingFull = nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs (old: { wineWowPackages.stagingFull =
patches = old.patches ++ [ ../../patches/wine-6006.patch ]; nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs
waylandSupport = true; (old: {
fontconfigSupport = true; patches = old.patches ++ [ ../../patches/wine-6006.patch ];
vulkanSupport = true; waylandSupport = true;
}); fontconfigSupport = true;
vulkanSupport = true;
});
}) })
(final: prev: { (final: prev: {
bitwig-studio5-3 = bitwig-studio5-3 = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override {
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-studio = };
nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped;
};
}) })
]; ];
}; };
@ -74,26 +73,29 @@
console = { console = {
earlySetup = true; earlySetup = true;
colors = with pkgs.lib.nix-rice; colors =
let theme = palette.toRgbShortHex pkgs.rice.colorPalette; with pkgs.lib.nix-rice;
let
theme = palette.toRgbShortHex pkgs.rice.colorPalette;
in in
with theme; [ with theme;
# normal.black [
# normal.red # normal.black
# normal.green # normal.red
# normal.yellow # normal.green
# normal.blue # normal.yellow
# normal.magenta # normal.blue
# normal.cyan # normal.magenta
# normal.white # normal.cyan
# bright.black # normal.white
# bright.red # bright.black
# bright.green # bright.red
# bright.yellow # bright.green
# bright.blue # bright.yellow
# bright.magenta # bright.blue
# bright.cyan # bright.magenta
# bright.white # bright.cyan
# bright.white
"282c34" "282c34"
"e06c75" "e06c75"
@ -111,7 +113,7 @@
"c678dd" "c678dd"
"56b6c2" "56b6c2"
"c8ccd4" "c8ccd4"
]; ];
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -156,7 +158,13 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
kernelPackages = pkgs.linuxPackages_latest; 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 ]; extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ];
initrd.systemd.enable = true; initrd.systemd.enable = true;
initrd.kernelModules = [ initrd.kernelModules = [
@ -335,7 +343,7 @@
enable = true; enable = true;
settings = { settings = {
default_session = { 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'"; # --theme 'border=magenta;prompt=green;time=red;action=blue;button=yellow;container=black;input=red'";
user = "greeter"; user = "greeter";
}; };
@ -417,12 +425,12 @@
environment.pathsToLink = [ "/share/fish" ]; environment.pathsToLink = [ "/share/fish" ];
programs.bash = { programs.bash = {
interactiveShellInit = '' interactiveShellInit = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi fi
''; '';
}; };
services.flatpak.enable = true; services.flatpak.enable = true;

5
modules/home/emacs.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
let let
emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages ( emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (
epkgs: [ epkgs: [
@ -10,8 +10,6 @@ let
epkgs.cider epkgs.cider
epkgs.editorconfig epkgs.editorconfig
epkgs.shfmt epkgs.shfmt
# epkgs.nixpkgs-fmt
# epkgs.nixfmt
epkgs.apheleia epkgs.apheleia
epkgs.parinfer-rust-mode epkgs.parinfer-rust-mode
epkgs.manualPackages.tree-sitter-langs epkgs.manualPackages.tree-sitter-langs
@ -19,6 +17,7 @@ let
epkgs.pretty-sha-path epkgs.pretty-sha-path
epkgs.pdf-tools epkgs.pdf-tools
epkgs.all-the-icons epkgs.all-the-icons
epkgs.eldoc
] ]
)); ));
in { in {

3
modules/home/niri.nix
View file

@ -12,9 +12,8 @@ in {
spawn-at-startup = [ spawn-at-startup = [
{ command = ["clipse" "-listen"]; } { 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 = [ "systemctl" "--user" "restart" "xwayland-satellite.service" ]; }
{ command = [ "sleep5; ${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; }
]; ];
workspaces = { workspaces = {