Compare commits

..

No commits in common. "39cd50f49cc6ac94bcfced0c1f8ddf1399de3a30" and "45e5a8adc8655c9f7ed0c235bbf320cc6e6081b1" have entirely different histories.

8 changed files with 10 additions and 70 deletions

View file

@ -651,7 +651,6 @@
"repo-clone": "repo-clone", "repo-clone": "repo-clone",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"umu": "umu_2", "umu": "umu_2",
"zdwl": "zdwl",
"zdwm": "zdwm" "zdwm": "zdwm"
} }
}, },
@ -730,13 +729,13 @@
"revCount": 867, "revCount": 867,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" "url": "https://github.com/Open-Wine-Components/umu-launcher/"
}, },
"original": { "original": {
"dir": "packaging/nix", "dir": "packaging/nix",
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" "url": "https://github.com/Open-Wine-Components/umu-launcher/"
} }
}, },
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
@ -772,23 +771,6 @@
"type": "github" "type": "github"
} }
}, },
"zdwl": {
"flake": false,
"locked": {
"lastModified": 1734081909,
"narHash": "sha256-1gzw818Kqkn5JORht910b3kK3F2BZstzxdRFTaEAB5M=",
"ref": "0.7",
"rev": "49888cdcbbace159bc020e3f4be228e63e0c7bad",
"revCount": 1250,
"type": "git",
"url": "https://git.zynh.me/Zynh0722/dwl"
},
"original": {
"ref": "0.7",
"type": "git",
"url": "https://git.zynh.me/Zynh0722/dwl"
}
},
"zdwm": { "zdwm": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -16,7 +16,6 @@
repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone"; repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone";
zdwm = { url = "git+https://git.zynh.me/Zynh0722/dwm?ref=preanybar-systray"; flake = false; }; zdwm = { url = "git+https://git.zynh.me/Zynh0722/dwm?ref=preanybar-systray"; flake = false; };
zdwl = { url = "git+https://git.zynh.me/Zynh0722/dwl?ref=0.7"; flake = false; };
fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; }; fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; };
backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; }; backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; };
umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; };

View file

@ -22,7 +22,7 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# home.packages = with pkgs; [ flameshot ]; home.packages = with pkgs; [ flameshot ];
xdg.configFile."flameshot/flameshot.ini".text = lib.generators.toINI { } cfg.config; xdg.configFile."flameshot/flameshot.ini".text = lib.generators.toINI { } cfg.config;
}; };

View file

@ -53,7 +53,6 @@
syncthing.enable = true; syncthing.enable = true;
user.enable = true; user.enable = true;
wake-on-lan.enable = true; wake-on-lan.enable = true;
star-citizen.enable = true;
}; };
# Enable automatic login for the user. # Enable automatic login for the user.
@ -81,6 +80,11 @@
killall killall
linux-manual linux-manual
(inputs.nix-gaming.packages.${pkgs.system}.star-citizen.override {
useUmu = true;
location = "/data/star-citizen";
})
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -92,14 +96,6 @@
hardware.keyboard.uhk.enable = true; hardware.keyboard.uhk.enable = true;
swapDevices = [{
device = "/swap";
size = 16 * 1024;
}];
# Also recommended, either as an alternative or in addition
zramSwap.enable = true;
virtualisation = { virtualisation = {
libvirtd.enable = true; libvirtd.enable = true;
}; };

View file

@ -88,8 +88,6 @@
gparted gparted
arandr arandr
bear
spotify spotify
vesktop vesktop
(writeShellScriptBin "discord" '' (writeShellScriptBin "discord" ''
@ -97,7 +95,6 @@
'') '')
steam-run steam-run
brave
nix-output-monitor nix-output-monitor
(writeShellScriptBin "rebuild" '' (writeShellScriptBin "rebuild" ''

View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, inputs, ... }: { lib, config, pkgs, ... }:
let let
cfg = config.snowhawk.dwl; cfg = config.snowhawk.dwl;
@ -9,9 +9,7 @@ in
package = lib.mkOption { package = lib.mkOption {
type = with lib.types; package; type = with lib.types; package;
default = pkgs.dwl.overrideAttrs (old: { default = pkgs.dwl;
src = inputs.zdwl;
});
apply = p: p.overrideAttrs { apply = p: p.overrideAttrs {
postInstall = '' postInstall = ''
mkdir -p $out/share/wayland-sessions mkdir -p $out/share/wayland-sessions
@ -29,11 +27,6 @@ in
enable = true; enable = true;
sessionPackages = [ cfg.package ]; sessionPackages = [ cfg.package ];
defaultSession = "dwl"; defaultSession = "dwl";
# TODO: greetd?
sddm = {
enable = lib.mkDefault true;
wayland.enable = lib.mkDefault true;
};
}; };
security = { security = {
@ -60,8 +53,6 @@ in
services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true; services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(flameshot.override { enableWlrSupport = true; })
wl-clipboard wl-clipboard
wmenu wmenu
foot foot

View file

@ -83,7 +83,6 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
dmenu dmenu
xclip xclip
flameshot
]; ];
home-manager.sharedModules = [ home-manager.sharedModules = [

View file

@ -1,24 +0,0 @@
{ lib, config, inputs, pkgs, ... }:
let
cfg = config.snowhawk.star-citizen;
in
{
options.snowhawk.star-citizen = {
enable = lib.mkEnableOption "star-citizen";
};
config = lib.mkIf cfg.enable {
boot.kernel.sysctl = {
"vm.max_map_count" = 16777216;
"ds.file-max" = 524288;
};
environment.systemPackages = [
(inputs.nix-gaming.packages.${pkgs.system}.star-citizen.override {
useUmu = true;
location = "/data/star-citizen";
})
];
};
}