Compare commits
7 commits
e7ab8483ce
...
2a08a90103
| Author | SHA1 | Date | |
|---|---|---|---|
2a08a90103
|
|||
|
2396af5c51
|
|||
|
f268b9d170
|
|||
|
b09594dfff
|
|||
|
ac234d761b
|
|||
|
c3a459ced3
|
|||
|
ed451c1df2
|
7 changed files with 50 additions and 48 deletions
45
flake.lock
45
flake.lock
|
|
@ -54,11 +54,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715820685,
|
||||
"narHash": "sha256-FiqOiHmr4a9IIWjbDd88Lt6Do78TKEbMbNYPlyBcfSY=",
|
||||
"lastModified": 1715914213,
|
||||
"narHash": "sha256-QiukFbOYCdlpmbG7MTTSq4CCU9blp4rSA21veX9vyKY=",
|
||||
"owner": "atuinsh",
|
||||
"repo": "atuin",
|
||||
"rev": "2e35af1c86dc3ddb02dbababf909c7f5248368c3",
|
||||
"rev": "64b7581644e2dbc4d1f31f220158c0cc321f2139",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -195,11 +195,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715822638,
|
||||
"narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=",
|
||||
"lastModified": 1715872464,
|
||||
"narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432",
|
||||
"rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -219,11 +219,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715850300,
|
||||
"narHash": "sha256-cmwhFzasd7P09YU798FSlLkLCCbHAeu9x2kut7gPDAU=",
|
||||
"lastModified": 1715910562,
|
||||
"narHash": "sha256-5H1xZ7LgJGEGjVgLMSJYftyrIt0zmmJGX9XMxdT1q3k=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "799871438560ec035b58b44199971a8ac13037d0",
|
||||
"rev": "238eefc3f18c7079b2ec3fa4c1b9b11e1c7dcc7c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -394,11 +394,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714641030,
|
||||
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
|
||||
"lastModified": 1715865404,
|
||||
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
|
||||
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -670,11 +670,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1715148395,
|
||||
"narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
|
||||
"lastModified": 1715881912,
|
||||
"narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
|
||||
"rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -822,9 +822,6 @@
|
|||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_7",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
@ -832,11 +829,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715850717,
|
||||
"narHash": "sha256-HGY8w2Glb5xe4/l69Auv6R1kxbAQehB1vWFGnvzvSR8=",
|
||||
"lastModified": 1715870890,
|
||||
"narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "963646978438e31c0925e16c4eca089fda69bac2",
|
||||
"rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -908,11 +905,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715825775,
|
||||
"narHash": "sha256-7np2/EEr5Xm8IuKWQ43q8AA1Lb6Us2BW6rYMxGrInIg=",
|
||||
"lastModified": 1715912155,
|
||||
"narHash": "sha256-UXHk4dKvvm5mSuDDON3lXU5CHKiTRnIjA5mUtDOtKEU=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "55f468b3d49c5d3321e85f2f9b1158476a2a90fb",
|
||||
"rev": "d3a96b08a7280a5753246129b462eed3662815d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ def is-i3 [] {
|
|||
}
|
||||
|
||||
export def ipc-cmd [--raw, ...parameters: string] {
|
||||
let result = (run-external --redirect-stdout (ipcCmd) ...$parameters)
|
||||
let result = (run-external (ipcCmd) ...$parameters)
|
||||
if $raw {
|
||||
$result
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -61,24 +61,24 @@ in
|
|||
# bright7 = "e6e6e6"; # bright white
|
||||
|
||||
# Catppuccin Mocha
|
||||
foreground = "cdd6f4"; # Text
|
||||
background = "1e1e2e"; # Base
|
||||
regular0 = "45475a"; # Surface 1
|
||||
regular1 = "f38ba8"; # red
|
||||
regular2 = "a6e3a1"; # green
|
||||
regular3 = "f9e2af"; # yellow
|
||||
regular4 = "89b4fa"; # blue
|
||||
regular5 = "f5c2e7"; # pink
|
||||
regular6 = "94e2d5"; # teal
|
||||
regular7 = "bac2de"; # Subtext 1
|
||||
bright0 = "585b70"; # Surface 2
|
||||
bright1 = "f38ba8"; # red
|
||||
bright2 = "a6e3a1"; # green
|
||||
bright3 = "f9e2af"; # yellow
|
||||
bright4 = "89b4fa"; # blue
|
||||
bright5 = "f5c2e7"; # pink
|
||||
bright6 = "94e2d5"; # teal
|
||||
bright7 = "a6adc8"; # Subtext 0
|
||||
# foreground = "cdd6f4"; # Text
|
||||
# background = "1e1e2e"; # Base
|
||||
# regular0 = "45475a"; # Surface 1
|
||||
# regular1 = "f38ba8"; # red
|
||||
# regular2 = "a6e3a1"; # green
|
||||
# regular3 = "f9e2af"; # yellow
|
||||
# regular4 = "89b4fa"; # blue
|
||||
# regular5 = "f5c2e7"; # pink
|
||||
# regular6 = "94e2d5"; # teal
|
||||
# regular7 = "bac2de"; # Subtext 1
|
||||
# bright0 = "585b70"; # Surface 2
|
||||
# bright1 = "f38ba8"; # red
|
||||
# bright2 = "a6e3a1"; # green
|
||||
# bright3 = "f9e2af"; # yellow
|
||||
# bright4 = "89b4fa"; # blue
|
||||
# bright5 = "f5c2e7"; # pink
|
||||
# bright6 = "94e2d5"; # teal
|
||||
# bright7 = "a6adc8"; # Subtext 0
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -201,6 +201,8 @@ in
|
|||
border-color-unfocused = catppuccin.overlay0;
|
||||
border-color-urgent = catppuccin.peach;
|
||||
|
||||
focus-follows-cursor = "always";
|
||||
|
||||
# target title bg text indicator border
|
||||
# client.focused $lavender $base $text $rosewater $lavender
|
||||
# client.focused_inactive $overlay0 $base $text $rosewater $overlay0
|
||||
|
|
|
|||
|
|
@ -479,6 +479,7 @@
|
|||
environment = {
|
||||
sessionVariables = {
|
||||
AMD_VULKAN_ICD = "RADV";
|
||||
WLR_RENDERER = "vulkan";
|
||||
};
|
||||
systemPackages = with pkgs; [
|
||||
appimage-run
|
||||
|
|
|
|||
|
|
@ -121,13 +121,16 @@
|
|||
enableAllFirmware = true;
|
||||
nvidia = {
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
# forceFullCompositionPipeline = true;
|
||||
powerManagement.enable = true; # Needed to make hibernate work properly
|
||||
forceFullCompositionPipeline = true;
|
||||
};
|
||||
|
||||
opengl = {
|
||||
driSupport32Bit = true;
|
||||
extraPackages = with pkgs; [ vaapiVdpau ];
|
||||
extraPackages = with pkgs; [
|
||||
vaapiVdpau
|
||||
vulkan-validation-layers
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -150,7 +153,7 @@
|
|||
"apple-mfi-fastcharge"
|
||||
"zenpower"
|
||||
];
|
||||
# boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
|
||||
kernelParams = [ "nvidia_drm.fbdev=1" ];
|
||||
extraModulePackages = with config.boot.kernelPackages; [
|
||||
zenpower
|
||||
cpupower
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ in
|
|||
QT_QPA_PLATFORMTHEME = "qt5ct";
|
||||
GDK_BACKEND = "wayland";
|
||||
SDL_VIDEODRIVER = "wayland";
|
||||
AMD_VULKAN_ICD = "RADV";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
Loading…
Reference in a new issue