oat
/
nix-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: oat:2f4ec6cf3f9c88057cc11a8811028ca4895ce89e
Branches Tags
oat:main
...
compare: oat:e8425f7d0f5c091db4f8df5bdf4dc5c4e5d60daa
Branches Tags
oat:main

3 Commits
2f4ec6cf3f ... e8425f7d0f

Author SHA1 Message Date
Jill e8425f7d0f bluetooth mode. 2024-04-17 16:33:52 +03:00
Jill 7673a3ba71 universal transmutation resulting in explosion of half the atoms in the universe 2024-04-16 16:05:00 +03:00
Jill 86c13d3e74 update flake 2024-04-03 23:52:22 +03:00
6 changed files with 182 additions and 99 deletions
Show Stats Expand all files Collapse all files

230
flake.lock
View File

@ -167,6 +167,22 @@
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -187,11 +203,11 @@
},
"hardware": {
"locked": {
"lastModified": 1710123225,
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=",
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"type": "github"
},
"original": {
@ -207,11 +223,11 @@
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"lastModified": 1710888565,
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
"type": "github"
},
"original": {
@ -234,11 +250,11 @@
]
},
"locked": {
"lastModified": 1710091028,
"narHash": "sha256-yFk2kc8J2kVh0RWlwT+PQf0bpfUNcROOcRYcyQJbpk4=",
"lastModified": 1711466786,
"narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "05db7dfd7fc261e0195e54f8a6d655d4f370e70f",
"rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
"type": "github"
},
"original": {
@ -278,11 +294,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1710344304,
"narHash": "sha256-jE+/UGqRYkKBBpLTTV5ayCtVmD9N1WsSKpufszUPzcA=",
"lastModified": 1712173358,
"narHash": "sha256-IzBALfpky44Eil2oXEejJ3xHKRta60oYV2FgeJjKb3c=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "3e67ee0f5f66c74c0a0bd4f797361fd100c2e2d2",
"rev": "10146f5ec50caeae2d835f5f6296137e2ac6f243",
"type": "github"
},
"original": {
@ -294,11 +310,11 @@
"hyprland-catppuccin": {
"flake": false,
"locked": {
"lastModified": 1702668781,
"narHash": "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no=",
"lastModified": 1712161758,
"narHash": "sha256-XTqpmucOeHUgSpXQ0XzbggBFW+ZloRD/3mFhI+Tq4O8=",
"owner": "catppuccin",
"repo": "hyprland",
"rev": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017",
"rev": "b57375545f5da1f7790341905d1049b1873a8bb3",
"type": "github"
},
"original": {
@ -388,11 +404,11 @@
]
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"lastModified": 1711250455,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"type": "github"
},
"original": {
@ -406,14 +422,15 @@
"nixpkgs": [
"hyprlock",
"nixpkgs"
]
],
"systems": "systems_4"
},
"locked": {
"lastModified": 1708212860,
"narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=",
"lastModified": 1711250455,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "11d5ccda071c153dfdc18ef65338956a51cef96a",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"type": "github"
},
"original": {
@ -424,14 +441,15 @@
},
"hyprlang_5": {
"inputs": {
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_6",
"systems": "systems_6"
},
"locked": {
"lastModified": 1704230242,
"narHash": "sha256-S8DM+frECqmAdaUb3y5n3RjY73ajZcL5rnmx5YO+CkY=",
"lastModified": 1711250455,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "db5e1399b90d5a339330bdd49c5bca6fe58d6f60",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"type": "github"
},
"original": {
@ -444,14 +462,14 @@
"inputs": {
"hyprlang": "hyprlang_4",
"nixpkgs": "nixpkgs_5",
"systems": "systems_4"
"systems": "systems_5"
},
"locked": {
"lastModified": 1710528547,
"narHash": "sha256-zi2exTT5e3OOK6P7s6IjdiUUIawhqMN4R9RiUJ+T6Fc=",
"lastModified": 1711884603,
"narHash": "sha256-y1Om75muuJcEoLd/FOYGIZ5/ja/Mc4iBX/9S7vWF0C8=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "7ee406bf9b11351e3d73e6b6b2aec7de93ba61bf",
"rev": "071ebcefb9070e4397d75103f5f535b58dacf250",
"type": "github"
},
"original": {
@ -463,14 +481,15 @@
"hyprpaper": {
"inputs": {
"hyprlang": "hyprlang_5",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_7",
"systems": "systems_7"
},
"locked": {
"lastModified": 1710275050,
"narHash": "sha256-MMwlYYdPSkLEnvltef9liIBpoqUtilxuGiJE231prag=",
"lastModified": 1711556036,
"narHash": "sha256-z+ZgMjGC8540k3Z6Z49ZnEvbWyLGXtWPSCagMOrmuXk=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "f57d991e3a73bcc447dc4b87e1689132295c7076",
"rev": "5838c90cd29374935930281f62bc131d8bcf2295",
"type": "github"
},
"original": {
@ -549,11 +568,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1710252211,
"narHash": "sha256-hQChQpB4LDBaSrNlD6DPLhU9T+R6oyxMCg2V+S7Y1jg=",
"lastModified": 1712090461,
"narHash": "sha256-PAfFp+YEKpkzwz6ruXQMvTa1puO4ySSu2G4Sp/jkCc8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7eeacecff44e05a9fd61b9e03836b66ecde8a525",
"rev": "e976fa8f49c35cf28496301a1ef2aa23ad576b56",
"type": "github"
},
"original": {
@ -596,11 +615,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1709961763,
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github"
},
"original": {
@ -611,6 +630,22 @@
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
@ -626,29 +661,13 @@
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1702645756,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1703637592,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
@ -660,11 +679,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1710162809,
"narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
"lastModified": 1711668574,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github"
},
"original": {
@ -673,6 +692,22 @@
"type": "indirect"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"catppuccin-vsc": "catppuccin-vsc",
@ -687,6 +722,7 @@
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_8",
"nixpkgs-unstable": "nixpkgs-unstable",
"waybar": "waybar",
"waybar-catppuccin": "waybar-catppuccin"
}
},
@ -750,14 +786,78 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_7": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"waybar": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1712127529,
"narHash": "sha256-R3yPS5ktvzhUI+TeHTDkbKgiA8SDvozu33azFUeMVoo=",
"owner": "Alexays",
"repo": "Waybar",
"rev": "42dc9cb85f27e3db02da83cd13624cfc5a7191d3",
"type": "github"
},
"original": {
"owner": "Alexays",
"repo": "Waybar",
"type": "github"
}
},
"waybar-catppuccin": {
"flake": false,
"locked": {
"lastModified": 1678438606,
"narHash": "sha256-WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=",
"lastModified": 1711907468,
"narHash": "sha256-9lY+v1CTbpw2lREG/h65mLLw5KuT8OJdEPOb+NNC6Fo=",
"owner": "catppuccin",
"repo": "waybar",
"rev": "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff",
"rev": "0830796af6aa64ce8bc7453d42876a628777ac68",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -14,6 +14,8 @@
catppuccin-vsc.url = "github:catppuccin/vscode";
crystal-flake.url = "github:manveru/crystal-flake";
waybar.url = "github:Alexays/Waybar";
hyprland.url = "github:hyprwm/Hyprland";
hyprlock.url = "github:hyprwm/hyprlock";

5
hosts/seven-red-suns/lenovo-thinkpad-x1-1st-gen.nix
View File

@ -11,6 +11,11 @@
# Use power-profile-daemon for battery saving management
services.power-profiles-daemon.enable = true;
hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
services.blueman.enable = true;
# better performance than the actual Intel driver
services.xserver.videoDrivers = ["modesetting"];

10
modules/desktop/waybar.nix
View File

@ -1,4 +1,4 @@
{ lib, config, pkgs, inputs, ... }:
{ lib, config, pkgs, inputs, system, ... }:
with lib;
let
@ -6,12 +6,18 @@ let
in {
options.modules.desktop.waybar = {
enable = mkEnableOption "Enable Waybar, a lightweight desktop environment based on GTK+";
package = mkOption {
type = types.package;
default = inputs.waybar.packages.${system}.default;
example = "pkgs.waybar";
};
};
config = mkIf cfg.enable {
hm.wayland.windowManager.hyprland.settings.exec-once = [ "${lib.getExe pkgs.waybar}" ];
hm.wayland.windowManager.hyprland.settings.exec-once = [ "${lib.getExe cfg.package}" ];
hm.programs.waybar = {
enable = true;
package = cfg.package;
style = builtins.concatStringsSep "\n" [
"@import \"${inputs.waybar-catppuccin}/themes/mocha.css\";"
(lib.readFile ../../config/waybar.css)

3
modules/software/editors/vscode.nix
View File

@ -15,6 +15,7 @@ in {
jnoortheen.nix-ide
sumneko.lua
ms-vsliveshare.vsliveshare
svelte.svelte-vscode
];
mutableExtensionsDir = false;
enableExtensionUpdateCheck = false;
@ -57,4 +58,4 @@ in {
};
};
};
}
}

31
overlays/waybar.nix
View File

@ -1,31 +0,0 @@
final: prev: {
waybar = prev.waybar.overrideAttrs ( old: {
version = "0.10.0";
src = prev.fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = "0.10.0";
hash = "sha256-p1VRrKT2kTDy48gDXPMHlLbfcokAOFeTZXGzTeO1SAE=";
};
# fix gtk-layer-shell issue
mesonFlags = builtins.filter (a: !(prev.lib.strings.hasInfix "gtk-layer-shell" a)) old.mesonFlags;
# fix cava version mismatch issue
postUnpack = let
# Derived from subprojects/cava.wrap
libcava.src = prev.fetchFromGitHub {
owner = "LukashonakV";
repo = "cava";
rev = "0.10.1";
hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw=";
};
in ''
pushd "$sourceRoot"
cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1
patchShebangs .
popd
'';
} );
}