diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/common.nix | 2 | ||||
| -rw-r--r-- | nixos/icewm.nix | 34 | ||||
| -rw-r--r-- | nixos/kusanagi.nix | 11 | ||||
| -rw-r--r-- | nixos/wayfire.nix | 19 | ||||
| -rw-r--r-- | nixos/wmonly.nix | 30 |
5 files changed, 62 insertions, 34 deletions
diff --git a/nixos/common.nix b/nixos/common.nix index 5028001..bd29c11 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -290,7 +290,7 @@ gnome.seahorse gqrx sdrpp - qgis + #qgis virt-manager tagainijisho anki diff --git a/nixos/icewm.nix b/nixos/icewm.nix index 264a1e1..b8b3e51 100644 --- a/nixos/icewm.nix +++ b/nixos/icewm.nix @@ -1,34 +1,14 @@ { config, lib, pkgs, modulesPath, ... }: { + imports = [ + ./wmonly.nix + ]; + services.xserver.windowManager.icewm.enable = true; services.xserver.windowManager.windowmaker.enable = true; services.xserver.displayManager.sx.enable = true; - services.udisks2.enable = true; - services.gvfs.enable = true; - - environment.systemPackages = with pkgs; [ - i3lock - brightnessctl - pulseaudio - pavucontrol - networkmanagerapplet - xfce.xfce4-appfinder - xfce.xfce4-taskmanager - - arandr - dmenu - feh - acpi - netsurf.browser - sylpheed - xfe - libreoffice-still - pcmanfm - xfce.ristretto - xarchiver - epdfview - leafpad - geany - ]; + nixpkgs.config.packageOverrides = pkgs: { + chicago95 = import ./pkg_chicago95.nix { inherit pkgs; }; + }; } diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix index 0b177de..01077e5 100644 --- a/nixos/kusanagi.nix +++ b/nixos/kusanagi.nix @@ -10,9 +10,9 @@ let sha256 = "sha256:0pxljc5bzcwb8c43qmm5l49p03snq7piqnshglqday2dw6cfcd6l"; }; home-manager = builtins.fetchTarball { - # branch release-23.05 as of 2023-11-14 - url = "https://github.com/nix-community/home-manager/archive/04bac349d585c9df38d78e0285b780a140dc74a4.tar.gz"; - sha256 = "sha256:188lks1ipli1i6xcbhsn004aack7j3ky2mrq9v6dwxbjj1m8rs9h"; + # branch release-23.11 as of 2023-12-25 + url = "https://github.com/nix-community/home-manager/archive/d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224.tar.gz"; + sha256 = "sha256:16ab1k33aivqc5ighi95nh28pssbds5glz3bb371gb06qpiydihl"; }; in { @@ -20,7 +20,7 @@ in [ (modulesPath + "/installer/scan/not-detected.nix") ./common.nix - ./icewm.nix + ./wayfire.nix (import "${home-manager}/nixos") ]; @@ -107,7 +107,6 @@ in nur = import nurSrc { inherit pkgs; }; - chicago95 = import ./pkg_chicago95.nix { inherit pkgs; }; }; home-manager.users.lx = import ../nixpkgs/kusanagi.nix { inherit pkgs; }; @@ -126,7 +125,7 @@ in # ---- printing ---- services.printing.enable = true; - services.printing.drivers = [ pkgs.cups-brother-hl1210w ]; + #services.printing.drivers = [ pkgs.cups-brother-hl1210w ]; services.avahi.enable = true; services.avahi.nssmdns = true; services.avahi.openFirewall = true; diff --git a/nixos/wayfire.nix b/nixos/wayfire.nix new file mode 100644 index 0000000..004ad43 --- /dev/null +++ b/nixos/wayfire.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, modulesPath, ... }: +{ + imports = [ + ./wmonly.nix + ]; + + services.xserver.displayManager.sx.enable = true; + + security.pam.services.swaylock = {}; + + environment.systemPackages = with pkgs; [ + wayfire-with-plugins + wayfirePlugins.wcm + wayfirePlugins.wf-shell + waybar + alacritty + swaylock + ]; +} diff --git a/nixos/wmonly.nix b/nixos/wmonly.nix new file mode 100644 index 0000000..c9bde38 --- /dev/null +++ b/nixos/wmonly.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, modulesPath, ... }: +{ + services.udisks2.enable = true; + services.gvfs.enable = true; + + environment.systemPackages = with pkgs; [ + i3lock + brightnessctl + pulseaudio + pavucontrol + networkmanagerapplet + xfce.xfce4-appfinder + xfce.xfce4-taskmanager + + arandr + dmenu + feh + acpi + netsurf.browser + sylpheed + xfe + libreoffice-still + pcmanfm + xfce.ristretto + xarchiver + epdfview + leafpad + geany + ]; +} |