diff options
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/Makefile | 2 | ||||
| -rw-r--r-- | nixpkgs/icewm.nix | 21 | ||||
| -rw-r--r-- | nixpkgs/kusanagi.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/wayfire.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/wmonly.nix | 20 |
5 files changed, 33 insertions, 20 deletions
diff --git a/nixpkgs/Makefile b/nixpkgs/Makefile index 2eb8d4a..7d2fb5c 100644 --- a/nixpkgs/Makefile +++ b/nixpkgs/Makefile @@ -1,3 +1,3 @@ all: nixfmt `hostname`.nix - nix run home-manager/release-23.05 -- switch -f `hostname`.nix + nix run home-manager/release-23.11 -- switch -f `hostname`.nix diff --git a/nixpkgs/icewm.nix b/nixpkgs/icewm.nix index 2a33c0d..225c8fc 100644 --- a/nixpkgs/icewm.nix +++ b/nixpkgs/icewm.nix @@ -1,4 +1,6 @@ { pkgs, ... }: { + imports = [ ./wmonly.nix ]; + nixpkgs.config.packageOverrides = pkgs: { chicago95 = import ../nixos/pkg_chicago95.nix { inherit pkgs; }; }; @@ -46,22 +48,5 @@ ../pcmanfm/desktop-items-0.conf; }; - home.packages = with pkgs; [ chicago95 xfce.tumbler ]; - - xdg.desktopEntries.llpp = { - name = "llpp"; - genericName = "PDF viewer"; - exec = "llpp %f"; - terminal = false; - categories = [ "Graphics" "Viewer" ]; - mimeType = [ "application/pdf" "application/x-pdf" ]; - type = "Application"; - }; - xdg.mimeApps.enable = true; - xdg.mimeApps.defaultApplications = { - "application/pdf" = [ "epdfview.desktop" ]; - "image/jpeg" = [ "org.xfce.ristretto.desktop" ]; - "image/png" = [ "org.xfce.ristretto.desktop" ]; - "text/plain" = [ "leafpad.desktop" ]; - }; + home.packages = with pkgs; [ chicago95 ]; } diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix index 6422ee4..840e41b 100644 --- a/nixpkgs/kusanagi.nix +++ b/nixpkgs/kusanagi.nix @@ -6,7 +6,7 @@ let sha256 = "sha256:1dizlmwzl6319s9cfbd770ydlj0kf0k3yz5rzw4xni8lnh691hx7"; }; in { - imports = [ ./common.nix ./icewm.nix ]; + imports = [ ./common.nix ./wayfire.nix ]; programs.bash.profileExtra = '' function mklink { diff --git a/nixpkgs/wayfire.nix b/nixpkgs/wayfire.nix new file mode 100644 index 0000000..191846b --- /dev/null +++ b/nixpkgs/wayfire.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + imports = [ ./wmonly.nix ]; + + home.file = { + ".config/wayfire.ini".source = ../wayfire/wayfire.ini; + ".config/waybar/config".source = ../waybar/config; + }; +} diff --git a/nixpkgs/wmonly.nix b/nixpkgs/wmonly.nix new file mode 100644 index 0000000..7096c69 --- /dev/null +++ b/nixpkgs/wmonly.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ xfce.tumbler ]; + + xdg.desktopEntries.llpp = { + name = "llpp"; + genericName = "PDF viewer"; + exec = "llpp %f"; + terminal = false; + categories = [ "Graphics" "Viewer" ]; + mimeType = [ "application/pdf" "application/x-pdf" ]; + type = "Application"; + }; + xdg.mimeApps.enable = true; + xdg.mimeApps.defaultApplications = { + "application/pdf" = [ "epdfview.desktop" ]; + "image/jpeg" = [ "org.xfce.ristretto.desktop" ]; + "image/png" = [ "org.xfce.ristretto.desktop" ]; + "text/plain" = [ "leafpad.desktop" ]; + }; +} |