erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:e7ab8483cee1c224c58fe80745e864fe9719bb1a
Branches Tags
erwin:main
..
compare: erwin:2a08a90103d22b53b91fc1c9e0de671814496620
Branches Tags
erwin:main

7 commits
e7ab8483ce ... 2a08a90103

Author SHA1 Message Date
Erwin Boskma
2a08a90103
desktop: Remove AMD GPU only env variable 2024-05-17 22:27:57 +02:00
Erwin Boskma
2396af5c51
mimir: NVIDIA tweaks 2024-05-17 22:27:46 +02:00
Erwin Boskma
f268b9d170
loki: Use Vulkan renderer for wlroots 2024-05-17 22:27:21 +02:00
Erwin Boskma
b09594dfff
foot: Use default colours 2024-05-17 22:27:04 +02:00
Erwin Boskma
ac234d761b
eww: Fixed workspaces script for newer nushell 2024-05-17 22:25:56 +02:00
Erwin Boskma
c3a459ced3
river: Make focus follow cursor 2024-05-17 09:37:17 +02:00
Erwin Boskma
ed451c1df2
flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/2e35af1c86dc3ddb02dbababf909c7f5248368c3?narHash=sha256-FiqOiHmr4a9IIWjbDd88Lt6Do78TKEbMbNYPlyBcfSY%3D' (2024-05-16)
  → 'github:atuinsh/atuin/64b7581644e2dbc4d1f31f220158c0cc321f2139?narHash=sha256-QiukFbOYCdlpmbG7MTTSq4CCU9blp4rSA21veX9vyKY%3D' (2024-05-17)
• Updated input 'disko':
    'github:nix-community/disko/476eef8d85aa09389ae7baf6e6b60357f6a01432?narHash=sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E%3D' (2024-05-16)
  → 'github:nix-community/disko/5f6dbcce99d60dd77f96dfc66d06bbea149a40e1?narHash=sha256-mkZ3hrPG7d%2BqL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk%3D' (2024-05-16)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/799871438560ec035b58b44199971a8ac13037d0?narHash=sha256-cmwhFzasd7P09YU798FSlLkLCCbHAeu9x2kut7gPDAU%3D' (2024-05-16)
  → 'github:nix-community/emacs-overlay/238eefc3f18c7079b2ec3fa4c1b9b11e1c7dcc7c?narHash=sha256-5H1xZ7LgJGEGjVgLMSJYftyrIt0zmmJGX9XMxdT1q3k%3D' (2024-05-17)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e?narHash=sha256-yzcRNDoyVP7%2BSCNX0wmuDju1NUCt8Dz9%2BlyUXEI0dbI%3D' (2024-05-02)
  → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9?narHash=sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78%3D' (2024-05-16)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a?narHash=sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE%3D' (2024-05-08)
  → 'github:NixOS/nixos-hardware/ff1be1e3cdf884df0935ab28745ab13c3c26d828?narHash=sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek%3D' (2024-05-16)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/963646978438e31c0925e16c4eca089fda69bac2?narHash=sha256-HGY8w2Glb5xe4/l69Auv6R1kxbAQehB1vWFGnvzvSR8%3D' (2024-05-16)
  → 'github:cachix/git-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1?narHash=sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0%3D' (2024-05-16)
• Removed input 'pre-commit-hooks/flake-utils'
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/55f468b3d49c5d3321e85f2f9b1158476a2a90fb?narHash=sha256-7np2/EEr5Xm8IuKWQ43q8AA1Lb6Us2BW6rYMxGrInIg%3D' (2024-05-16)
  → 'github:oxalica/rust-overlay/d3a96b08a7280a5753246129b462eed3662815d5?narHash=sha256-UXHk4dKvvm5mSuDDON3lXU5CHKiTRnIjA5mUtDOtKEU%3D' (2024-05-17)
 2024-05-17 09:06:19 +02:00
7 changed files with 50 additions and 48 deletions
Show stats Expand all files Collapse all files

45
flake.lock
View file

@ -54,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715820685, "lastModified": 1715914213,
"narHash": "sha256-FiqOiHmr4a9IIWjbDd88Lt6Do78TKEbMbNYPlyBcfSY=", "narHash": "sha256-QiukFbOYCdlpmbG7MTTSq4CCU9blp4rSA21veX9vyKY=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "2e35af1c86dc3ddb02dbababf909c7f5248368c3", "rev": "64b7581644e2dbc4d1f31f220158c0cc321f2139",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715822638, "lastModified": 1715872464,
"narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", "narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432", "rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1715850300, "lastModified": 1715910562,
"narHash": "sha256-cmwhFzasd7P09YU798FSlLkLCCbHAeu9x2kut7gPDAU=", "narHash": "sha256-5H1xZ7LgJGEGjVgLMSJYftyrIt0zmmJGX9XMxdT1q3k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "799871438560ec035b58b44199971a8ac13037d0", "rev": "238eefc3f18c7079b2ec3fa4c1b9b11e1c7dcc7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1714641030, "lastModified": 1715865404,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +670,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1715148395, "lastModified": 1715881912,
"narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -822,9 +822,6 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_7",
"flake-utils": [
"flake-utils"
],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -832,11 +829,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1715850717, "lastModified": 1715870890,
"narHash": "sha256-HGY8w2Glb5xe4/l69Auv6R1kxbAQehB1vWFGnvzvSR8=", "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "963646978438e31c0925e16c4eca089fda69bac2", "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -908,11 +905,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715825775, "lastModified": 1715912155,
"narHash": "sha256-7np2/EEr5Xm8IuKWQ43q8AA1Lb6Us2BW6rYMxGrInIg=", "narHash": "sha256-UXHk4dKvvm5mSuDDON3lXU5CHKiTRnIjA5mUtDOtKEU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "55f468b3d49c5d3321e85f2f9b1158476a2a90fb", "rev": "d3a96b08a7280a5753246129b462eed3662815d5",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home-manager/modules/eww/config/scripts/workspaces.nu
View file

@ -21,7 +21,7 @@ def is-i3 [] {
} }
export def ipc-cmd [--raw, ...parameters: string] { export def ipc-cmd [--raw, ...parameters: string] {
let result = (run-external --redirect-stdout (ipcCmd) ...$parameters) let result = (run-external (ipcCmd) ...$parameters)
if $raw { if $raw {
$result $result
} else { } else {

36
home-manager/modules/foot/default.nix
View file

@ -61,24 +61,24 @@ in
# bright7 = "e6e6e6"; # bright white # bright7 = "e6e6e6"; # bright white
# Catppuccin Mocha # Catppuccin Mocha
foreground = "cdd6f4"; # Text # foreground = "cdd6f4"; # Text
background = "1e1e2e"; # Base # background = "1e1e2e"; # Base
regular0 = "45475a"; # Surface 1 # regular0 = "45475a"; # Surface 1
regular1 = "f38ba8"; # red # regular1 = "f38ba8"; # red
regular2 = "a6e3a1"; # green # regular2 = "a6e3a1"; # green
regular3 = "f9e2af"; # yellow # regular3 = "f9e2af"; # yellow
regular4 = "89b4fa"; # blue # regular4 = "89b4fa"; # blue
regular5 = "f5c2e7"; # pink # regular5 = "f5c2e7"; # pink
regular6 = "94e2d5"; # teal # regular6 = "94e2d5"; # teal
regular7 = "bac2de"; # Subtext 1 # regular7 = "bac2de"; # Subtext 1
bright0 = "585b70"; # Surface 2 # bright0 = "585b70"; # Surface 2
bright1 = "f38ba8"; # red # bright1 = "f38ba8"; # red
bright2 = "a6e3a1"; # green # bright2 = "a6e3a1"; # green
bright3 = "f9e2af"; # yellow # bright3 = "f9e2af"; # yellow
bright4 = "89b4fa"; # blue # bright4 = "89b4fa"; # blue
bright5 = "f5c2e7"; # pink # bright5 = "f5c2e7"; # pink
bright6 = "94e2d5"; # teal # bright6 = "94e2d5"; # teal
bright7 = "a6adc8"; # Subtext 0 # bright7 = "a6adc8"; # Subtext 0
}; };
}; };
}; };

2
home-manager/modules/river/default.nix
View file

@ -201,6 +201,8 @@ in
border-color-unfocused = catppuccin.overlay0; border-color-unfocused = catppuccin.overlay0;
border-color-urgent = catppuccin.peach; border-color-urgent = catppuccin.peach;
focus-follows-cursor = "always";
# target title bg text indicator border # target title bg text indicator border
# client.focused $lavender $base $text $rosewater $lavender # client.focused $lavender $base $text $rosewater $lavender
# client.focused_inactive $overlay0 $base $text $rosewater $overlay0 # client.focused_inactive $overlay0 $base $text $rosewater $overlay0

1
machines/loki/configuration.nix
View file

@ -479,6 +479,7 @@
environment = { environment = {
sessionVariables = { sessionVariables = {
AMD_VULKAN_ICD = "RADV"; AMD_VULKAN_ICD = "RADV";
WLR_RENDERER = "vulkan";
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
appimage-run appimage-run

11
machines/mimir/configuration.nix
View file

@ -121,13 +121,16 @@
enableAllFirmware = true; enableAllFirmware = true;
nvidia = { nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = true; powerManagement.enable = true; # Needed to make hibernate work properly
# forceFullCompositionPipeline = true; forceFullCompositionPipeline = true;
}; };
opengl = { opengl = {
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ vaapiVdpau ]; extraPackages = with pkgs; [
vaapiVdpau
vulkan-validation-layers
];
}; };
}; };
@ -150,7 +153,7 @@
"apple-mfi-fastcharge" "apple-mfi-fastcharge"
"zenpower" "zenpower"
]; ];
# boot.kernelParams = [ "amd_pstate.shared_mem=1" ]; kernelParams = [ "nvidia_drm.fbdev=1" ];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [
zenpower zenpower
cpupower cpupower

1
modules/desktop/default.nix
View file

@ -67,7 +67,6 @@ in
QT_QPA_PLATFORMTHEME = "qt5ct"; QT_QPA_PLATFORMTHEME = "qt5ct";
GDK_BACKEND = "wayland"; GDK_BACKEND = "wayland";
SDL_VIDEODRIVER = "wayland"; SDL_VIDEODRIVER = "wayland";
AMD_VULKAN_ICD = "RADV";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
}) })
]; ];