Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Grimmauld:7d6cd8f82488a31e49649251f39eb5112cbc90fa
Branches Tags
Grimmauld:main
Grimmauld:server-migration
..
compare: Grimmauld:71c041c920249c2f170744fb9f9f1a8edb7716eb
Branches Tags
Grimmauld:main
Grimmauld:server-migration

No commits in common. "7d6cd8f82488a31e49649251f39eb5112cbc90fa" and "71c041c920249c2f170744fb9f9f1a8edb7716eb" have entirely different histories.
7d6cd8f824 ... 71c041c920

10 changed files with 1436 additions and 65 deletions
Show Stats Expand all files Collapse all files

3
common/sound.nix
View File

@ -16,7 +16,8 @@ in {
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pwvucontrol (callPackage ../custom/pwvucontrol/package.nix {})
# pwvucontrol
playerctl playerctl
pulseaudio pulseaudio
]; ];

1
common/toolchains.nix
View File

@ -28,6 +28,7 @@ in {
ffmpeg-full ffmpeg-full
lm_sensors lm_sensors
imagemagick imagemagick
pypy3
nmap nmap
hyfetch hyfetch

1
configuration.nix
View File

@ -81,7 +81,6 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
# nix.package = pkgs.nixVersions.unstable;
programs.dconf.enable = true; programs.dconf.enable = true;

1240
custom/pwvucontrol/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

84
custom/pwvucontrol/package.nix Normal file
View File

@ -0,0 +1,84 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchFromGitLab
, cargo
, desktop-file-utils
, meson
, ninja
, pkg-config
, rustPlatform
, rustc
, wrapGAppsHook4
, cairo
, gdk-pixbuf
, glib
, gtk4
, libadwaita
, pango
, pipewire
, wireplumber
}:
let
wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
version = "0.4.17";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pipewire";
repo = "wireplumber";
rev = version;
hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
};
});
in
stdenv.mkDerivation rec {
pname = "pwvucontrol";
version = "0.3.1";
src = fetchFromGitHub {
owner = "saivert";
repo = "pwvucontrol";
rev = version;
hash = "sha256-t4JUpKtuO1JgrdsNbl0M/SwPmoqu7WxsaD74vlJeVhY=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"wireplumber-0.1.0" = "sha256-+LZ8xKok2AOegW8WvfrfZGXuQB4xHrLNshcTOHab+xQ=";
};
};
nativeBuildInputs = [
cargo
desktop-file-utils
meson
ninja
pkg-config
rustPlatform.bindgenHook
rustPlatform.cargoSetupHook
rustc
wrapGAppsHook4
];
buildInputs = [
cairo
gdk-pixbuf
glib
gtk4
libadwaita
pango
pipewire
wireplumber_0_4
];
meta = with lib; {
description = "Pipewire Volume Control";
homepage = "https://github.com/saivert/pwvucontrol";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ figsoda ];
mainProgram = "pwvucontrol";
platforms = platforms.linux;
};
}

136
flake.lock
View File

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1712079060, "lastModified": 1707830867,
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "1381a759b205dff7a6818733118d02253340fd5e", "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,12 +44,12 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1711742460, "lastModified": 1707922053,
"narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=",
"rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21",
"revCount": 197, "revCount": 193,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.197%2Brev-4dbdbee45728d8ce5788db6461aaaa89d98081f0/018e8bce-1229-7d78-a052-5121272f0341/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.193%2Brev-6eabc3f02fae3683bffab483e614bebfcd476b21/018da817-367d-75ac-bd41-470d92844bf2/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -78,11 +78,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1712410564, "lastModified": 1711734846,
"narHash": "sha256-SaieRX6F81W84WA973bA8NGAybjomH01y79FLLj5l6c=", "narHash": "sha256-EFrsJPOKrXp9h/C22ayBx3PwLMr3/FKEuCW8lQ/LpSc=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "658cc876186c56526ebacaa5954e3c88fb7e3577", "rev": "7cc6282416833f2dea96f97f516aceadbf406404",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,11 +138,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712369716, "lastModified": 1711506264,
"narHash": "sha256-9zs+0GTfSyGHdpiA6dPJXnDKAHmfr01OE9FxDE9KvPI=", "narHash": "sha256-GaQJvPyEkZu3YMdV9m1UENoeE10fkV6PcnLUtzPmuOY=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "2516d44cb178547194a66fa9c44930ab9bddd910", "rev": "051668b62b76270dc8ad3b011c6adbfe8ee8bde2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,12 +202,12 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1711952616, "lastModified": 1709274179,
"narHash": "sha256-WJvDdOph001fA1Ap3AyaQtz/afJAe7meSG5uJAdSE+A=", "narHash": "sha256-O6EC6QELBLHzhdzBOJj0chx8AOcd4nDRECIagfT5Nd0=",
"rev": "209048d7c545905c470f6f8c05c5061f391031a8", "rev": "4be608f4f81d351aacca01b21ffd91028c23cc22",
"revCount": 1822, "revCount": 1791,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1822%2Brev-209048d7c545905c470f6f8c05c5061f391031a8/018e98ba-d842-7dad-9d6a-0d0ee173b6b1/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1791%2Brev-4be608f4f81d351aacca01b21ffd91028c23cc22/018df913-b6d3-756c-b05c-358eca6e487d/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -234,11 +234,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1709336216,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,11 +331,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712296875, "lastModified": 1711231487,
"narHash": "sha256-Cmyer1n39J5IucCiyy84kf1XLr1Gdz/i5HKbzzEOQYM=", "narHash": "sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "9b0e8712f1a9e5569036b227d539b745fcf54aad", "rev": "1171169117f63f1de9ef2ea36efd8dcf377c6d5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,11 +357,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1712361380, "lastModified": 1711707302,
"narHash": "sha256-1cEiFtUvjBlp4J4kCvlsEobrTEsAzRBhRNvG8N1XH9w=", "narHash": "sha256-lJ3HdKjT3rQhul+PXW7Fh3iAE8GrddKjRM13GrHhQ/0=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "93cebcd0c0e910b8b7de606982efa8430a94676e", "rev": "f83d1a840e0a9b23737c31191ca46d6277cf9569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712150496, "lastModified": 1711707808,
"narHash": "sha256-24MK9P+3OIBeaVsyy6r/W77/9TVLCQGDF8RVOCkK4Uk=", "narHash": "sha256-n+WRrXW5aMYB/AyJtpZniPC+KhOMh1tRIvHlf2Ql+pA=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "8be938197486acb2af4ba91aae0fac57619a46c8", "rev": "ab228165212a7fc1911044bcf9a1f1d84cdaf5a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,11 +430,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712452624, "lastModified": 1711847810,
"narHash": "sha256-R35K+4krhK5B2fcV6W2HFe/uhXmP8YGTb35uZ+nDAxw=", "narHash": "sha256-gLeUuU3hQ2ErboVIyzDNes2bywdTYDidvi6wG5+tnQ8=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "06314bbf8fedd83c7253442994a2f0c81d47988e", "rev": "4ec1bf4262e913af85e3f699f564769ec2f23cff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +468,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712439257, "lastModified": 1711703276,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +485,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1711703276, "lastModified": 1709237383,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711460390, "lastModified": 1702780907,
"narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,22 +516,44 @@
"type": "github" "type": "github"
} }
}, },
"rmenu": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1711942514,
"narHash": "sha256-bml15AL/xdMQnlB8d812ufoN049Pm96B9tmcLoyDhW0=",
"owner": "imgurbot12",
"repo": "rmenu",
"rev": "aed276b104e4fa67341ea88465f452df4c886d6d",
"type": "github"
},
"original": {
"owner": "imgurbot12",
"repo": "rmenu",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"chaotic": "chaotic", "chaotic": "chaotic",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"rmenu": "rmenu",
"swaymux": "swaymux"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711885694, "lastModified": 1709219524,
"narHash": "sha256-dyezzeSbWMpflma+E9USmvSxuLgGcNGcGw3cOnX36ko=", "narHash": "sha256-8HHRXm4kYQLdUohNDUuCC3Rge7fXrtkjBUf0GERxrkM=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "e4a405f877efd820bef9c0e77a02494e47c17512", "rev": "9efa23c4dacee88b93540632eb3d88c5dfebfe17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -568,6 +590,26 @@
"type": "github" "type": "github"
} }
}, },
"swaymux": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1711985860,
"narHash": "sha256-clP8s7CYuUptC7CY8OrZOTRpYEust8XF/9XQujLuKKU=",
"ref": "refs/heads/main",
"rev": "1c40627570b941dae9735ced05b7bf9d3ef380bc",
"revCount": 32,
"type": "git",
"url": "https://git.grimmauld.de/Grimmauld/swaymux"
},
"original": {
"type": "git",
"url": "https://git.grimmauld.de/Grimmauld/swaymux"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

12
flake.nix
View File

@ -17,9 +17,18 @@
url = "github:fufexan/nix-gaming"; url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
swaymux = {
url = "git+https://git.grimmauld.de/Grimmauld/swaymux";
inputs.nixpkgs.follows = "nixpkgs";
};
rmenu = {
# url = "git+file:///home/grimmauld/rmenu";
url = "github:imgurbot12/rmenu";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs @ { self, nix-gaming, agenix, nixpkgs, chaotic, ... }: let outputs = inputs @ { self, swaymux, rmenu, nix-gaming, agenix, nixpkgs, chaotic, ... }: let
system = "x86_64-linux"; system = "x86_64-linux";
in { in {
nixosConfigurations = { nixosConfigurations = {
@ -30,6 +39,7 @@
agenix.nixosModules.default agenix.nixosModules.default
chaotic.nixosModules.default chaotic.nixosModules.default
nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.pipewireLowLatency
rmenu.nixosModules.default
./load_common.nix ./load_common.nix
./specific/grimm-nixos-laptop/configuration.nix ./specific/grimm-nixos-laptop/configuration.nix

5
modules/users.nix
View File

@ -26,11 +26,8 @@
prusa-slicer prusa-slicer
freecad freecad
openscad openscad
vlc
jetbrains.clion jetbrains.clion
jetbrains.idea-community # blender
jetbrains.pycharm-community
blender
]; ];
}; };
} }

3
sway/bar/config
View File

@ -75,8 +75,7 @@
"format-alt": "{time} {icon}", "format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module // "format-good": "", // An empty format will hide the module
// "format-full": "", // "format-full": "",
"format-icons": ["", "", "", "", ""], "format-icons": ["", "", "", "", ""]
"on-click": "rmenu -r powermenu"
}, },
"battery#bat2": { "battery#bat2": {
"bat": "BAT2" "bat": "BAT2"

16
sway/sway-conf.nix
View File

@ -1,13 +1,15 @@
{ inputs, system, pkgs, config, lib, ... }: { { inputs, system, pkgs, config, lib, ... }: let
environment.systemPackages = with pkgs; [ swaymux_pkg = inputs.swaymux.packages."${system}".default;
in {
environment.systemPackages = (with pkgs; [
alacritty alacritty
rmenu wmenu
grim grim
slurp slurp
brightnessctl brightnessctl
wl-clipboard wl-clipboard
swaymux ])
]; ++ [ swaymux_pkg ];
grimmShared.sway = { grimmShared.sway = {
enable = true; enable = true;
@ -23,7 +25,6 @@
right = "l"; right = "l";
term = "alacritty"; term = "alacritty";
menu = "rmenu -r drun | xargs swaymsg exec --"; menu = "rmenu -r drun | xargs swaymsg exec --";
menu_run = "rmenu -r run | xargs swaymsg exec --";
primecol = "#8800FF"; primecol = "#8800FF";
accentcol = "#5700a0"; accentcol = "#5700a0";
@ -35,7 +36,6 @@
}; };
keybinds = { keybinds = {
"$mod+d" = "exec $menu"; "$mod+d" = "exec $menu";
"$mod+Shift+d" = "exec $menu_run";
"$mod+Shift+s" = ''exec grim -g "$(slurp -d)" - | wl-copy''; "$mod+Shift+s" = ''exec grim -g "$(slurp -d)" - | wl-copy'';
"$mod+Return" = "exec $term"; "$mod+Return" = "exec $term";
"$mod+Shift+q" = "kill"; "$mod+Shift+q" = "kill";
@ -123,8 +123,6 @@
XF86AudioRaiseVolume = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%"; XF86AudioRaiseVolume = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
XF86AudioLowerVolume = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%"; XF86AudioLowerVolume = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
"Shift+XF86AudioLowerVolume" = "exec pactl set-source-volume @DEFAULT_SOURCE@ -5%";
"Shift+XF86AudioRaiseVolume" = "exec pactl set-source-volume @DEFAULT_SOURCE@ +5%";
XF86AudioMute = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle"; XF86AudioMute = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
XF86AudioPlay = "exec playerctl play-pause"; XF86AudioPlay = "exec playerctl play-pause";
XF86AudioNext = "exec playerctl next"; XF86AudioNext = "exec playerctl next";