Compare commits

...

6 commits

7 changed files with 88 additions and 82 deletions

148
flake.lock generated
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747864449, "lastModified": 1749155310,
"narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", "narHash": "sha256-t0HfHg/1+TbSra5s6nNM0o4tnb3uqWedShSpZXsUMYY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", "rev": "94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -35,11 +35,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1748047550, "lastModified": 1748970125,
"narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "b718a78696060df6280196a6f992d04c87a16aef", "rev": "323b5746d89e04b22554b061522dfce9e4c49b18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743550720, "lastModified": 1749398372,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745948457, "lastModified": 1749155331,
"narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "ac903e80b33ba6a88df83d02232483d99f327573", "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -341,11 +341,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745015490, "lastModified": 1749238452,
"narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "60754910946b4e2dc1377b967b7156cb989c5873", "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,11 +374,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1749049255, "lastModified": 1749540031,
"narHash": "sha256-QXg2B/bF/f9IeSiZwJuhdnz2xcnpu/hDfz4eIHWVhz8=", "narHash": "sha256-11k6hq/4Tao2PNBFQpSNTlFFKmKGswL17caKuZIE0sM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "d7a87ce6e2535f1029fc93b062d2828e8549c525", "rev": "6bdb1f413e4c592f73d91bef33dfb202503ef7ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +399,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743714874, "lastModified": 1749046714,
"narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -431,11 +431,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737634706, "lastModified": 1749154592,
"narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qt-support", "repo": "hyprland-qt-support",
"rev": "8810df502cdee755993cb803eba7b23f189db795", "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -467,11 +467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745951494, "lastModified": 1749155776,
"narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "narHash": "sha256-t1PM0wxQLQwv2F2AW23uA7pm5giwmcgYEWbNIRct9r4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "rev": "396e8aa1c06274835b69da7f9a015fff9a9b7522",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +496,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747484975, "lastModified": 1749145882,
"narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "163c83b3db48a17c113729c220a60b94596c9291", "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746635225, "lastModified": 1749135356,
"narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "674ea57373f08b7609ce93baff131117a0dfe70d", "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -546,11 +546,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747584298, "lastModified": 1749145760,
"narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1748959397, "lastModified": 1749471908,
"narHash": "sha256-hq+njWbMLAfQIFEP+8G/7xLz1ZELWC+780332FdpnW0=", "narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "20721e48123f1f900b323a76349130080a2f8343", "rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -662,11 +662,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748929857, "lastModified": 1749285348,
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -760,11 +760,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748598934, "lastModified": 1749533342,
"narHash": "sha256-c8o4KJPda4HNj/jWwjrWip7QZmfnuOQxKiAadzu/Ibs=", "narHash": "sha256-cQzKzqsPQmDBRDjcX4UFEQKNeAyibLIKkF+BBhE2JnI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "aa547bad843439615bc0a7f97a55d81058b2e9c8", "rev": "2b01a75679a03bd6557cf11c20b1588f436d6b94",
"revCount": 565, "revCount": 571,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -782,8 +782,8 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"quickshell": "quickshell", "quickshell": "quickshell",
"schizofox": "schizofox", "schizofox": "schizofox",
"superfreq": "superfreq", "systems": "systems_3",
"systems": "systems_3" "watt": "watt"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -794,11 +794,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748227081, "lastModified": 1749436897,
"narHash": "sha256-RLnN7LBxhEdCJ6+rIL9sbhjBVDaR6jG377M/CLP/fmE=", "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "1cbe817fd8c64a9f77ba4d7861a4839b0b15983e", "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -854,26 +854,6 @@
"type": "github" "type": "github"
} }
}, },
"superfreq": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1748722431,
"narHash": "sha256-kuvt+oy5nVr3C8PpjTBPSO25evEMA3rXGBg+PfHIevw=",
"owner": "notashelf",
"repo": "watt",
"rev": "da07011b02841c27ce751ea8dd67c4c3d153fb10",
"type": "github"
},
"original": {
"owner": "notashelf",
"repo": "watt",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -919,6 +899,26 @@
"type": "github" "type": "github"
} }
}, },
"watt": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1749377316,
"narHash": "sha256-hw3rL4rlIlYJMTeE7DlQ3lRhQDJURAhE+PC/NT4VAAQ=",
"owner": "notashelf",
"repo": "watt",
"rev": "154724c7b1bd49654ea55df719e1eb3219ec2000",
"type": "github"
},
"original": {
"owner": "notashelf",
"repo": "watt",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [
@ -947,11 +947,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745871725, "lastModified": 1749155346,
"narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "narHash": "sha256-KIkJu3zF8MF3DuGwzAmo3Ww9wsWXolwV30SjJRTAxYE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "rev": "44bf29f1df45786098920c655af523535a9191ae",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -55,7 +55,7 @@
schizofox.url = "github:schizofox/schizofox"; schizofox.url = "github:schizofox/schizofox";
superfreq = { watt = {
url = "github:notashelf/watt"; url = "github:notashelf/watt";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -16,6 +16,10 @@
thermald.enable = true; thermald.enable = true;
}; };
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
programs.zsh = {
enable = true;
enableBashCompletion = true;
};
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;

View file

@ -52,6 +52,7 @@
swww swww
microfetch microfetch
nmap nmap
nushell
pamixer pamixer
pwvucontrol pwvucontrol
pdfarranger pdfarranger

View file

@ -33,7 +33,8 @@ in {
The main user's git signing key, used to automatically sing git commits with this key The main user's git signing key, used to automatically sing git commits with this key
''; '';
default = '' default = ''
ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw== ''; ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw==
'';
}; };
}; };
}; };
@ -52,7 +53,7 @@ in {
"nix" "nix"
"docker" "docker"
]; ];
shell = self.packages.${pkgs.stdenv.system}.fish; shell = pkgs.zsh;
# hashedPasswordFile = "/etc/passwords/cr"; # hashedPasswordFile = "/etc/passwords/cr";
}; };
# root.hashedPasswordFile = "/persist/passwords/root"; # root.hashedPasswordFile = "/persist/passwords/root";

View file

@ -8,7 +8,7 @@
inherit (lib.modules) mkDefault; inherit (lib.modules) mkDefault;
in { in {
imports = [ imports = [
inputs.superfreq.nixosModules.default inputs.watt.nixosModules.default
]; ];
config = { config = {
environment.systemPackages = builtins.attrValues { environment.systemPackages = builtins.attrValues {
@ -29,9 +29,9 @@ in {
hardware.acpilight.enable = false; hardware.acpilight.enable = false;
services.superfreq = { services.watt = {
enable = true; enable = true;
# sample config from https://github.com/NotAShelf/superfreq#sample-configuration # sample config from https://github.com/NotAShelf/watt#sample-configuration
settings = { settings = {
charger = { charger = {
# CPU governor to use # CPU governor to use

View file

@ -2,8 +2,8 @@ input {
keyboard { keyboard {
xkb { xkb {
layout "us,ru" layout "us,ru"
variant "phonetic_winkeys," variant ",phonetic_winkeys"
options "grp:rctrl_rshift_toggle,compose:102" options "grp:rctrl_rshift_toggle, compose:102"
} }
repeat-rate 60 repeat-rate 60
repeat-delay 200 repeat-delay 200