diff options
| -rw-r--r-- | flake.lock | 89 | ||||
| -rw-r--r-- | flake.nix | 11 | ||||
| -rw-r--r-- | hosts/laptop/cfg.nix | 4 | ||||
| -rw-r--r-- | mixins/cli.nix | 13 | ||||
| -rw-r--r-- | mixins/dev.nix | 4 | ||||
| -rw-r--r-- | mixins/emacs/default.nix | 1 | ||||
| -rw-r--r-- | mixins/sway.nix | 18 | ||||
| -rw-r--r-- | profiles/user.nix | 3 |
8 files changed, 39 insertions, 104 deletions
diff --git a/flake.lock b/flake.lock index ad8a444..e14e6ef 100644 --- a/flake.lock +++ b/flake.lock @@ -77,50 +77,6 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": [ - "nixpkgs" - ], - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1680265039, - "narHash": "sha256-KUMwbTvoVxEh9VtXCDyWHb1PfvxUyWVvrlT6nahhf8s=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "24ef5d888c648d9a89fdd12c2dbff84f1153aa67", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1675359654, @@ -228,11 +184,11 @@ "agenix": "agenix", "hardware": "hardware", "home-manager": "home-manager", - "hyprland": "hyprland", "impermanence": "impermanence", "nixinate": "nixinate", "nixpkgs": "nixpkgs_3", - "programsdb": "programsdb" + "programsdb": "programsdb", + "viper-nix-common": "viper-nix-common" } }, "utils": { @@ -265,46 +221,23 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1679340088, - "narHash": "sha256-/1KiYoBivDj8HC/eVK2Tr2WYkVdKJxq2Lb0tQs0qqJo=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "1d64e12391a638201c679e71d4e22bb45e5faa8e", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "type": "gitlab" - } - }, - "xdph": { + "viper-nix-common": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", + "nixpkgs-lib": [ "nixpkgs" ] }, "locked": { - "lastModified": 1673116118, - "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", + "lastModified": 1683889296, + "narHash": "sha256-prMdngiMTbrHCBMY4ZFXmoGqb5FW/jaLL6RbAqtiUv8=", + "owner": "viperML", + "repo": "nix-common", + "rev": "1998388936cd743cf09461a52602a0ce211da0eb", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", + "owner": "viperML", + "repo": "nix-common", "type": "github" } } diff --git a/flake.nix b/flake.nix index 71991cc..3a4cd31 100644 --- a/flake.nix +++ b/flake.nix @@ -15,9 +15,13 @@ url = "github:wamserma/flake-programs-sqlite"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; + # hyprland = { + # url = "github:hyprwm/Hyprland"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + viper-nix-common = { + url = "github:viperML/nix-common"; + inputs.nixpkgs-lib.follows = "nixpkgs"; }; }; @@ -31,6 +35,7 @@ mkSystem = pkgs: system: h: (mkSystem_ pkgs system h [ inputs.agenix.nixosModules.age inputs.impermanence.nixosModules.impermanence + inputs.home-manager.nixosModules."home-manager" ]); in { apps = inputs.nixinate.nixinate.x86_64-linux self; diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix index 21a27fe..b868a6e 100644 --- a/hosts/laptop/cfg.nix +++ b/hosts/laptop/cfg.nix @@ -15,11 +15,11 @@ ../../mixins/tailscale.nix ../../mixins/cli.nix ../../mixins/greet.nix - ../../mixins/hyprland.nix + # ../../mixins/hyprland.nix ../../mixins/sway.nix ../../mixins/pipewire.nix ../../mixins/multimedia.nix - ../../mixins/emacs + # ../../mixins/emacs ]; config = { diff --git a/mixins/cli.nix b/mixins/cli.nix index dbed8fd..db77ab8 100644 --- a/mixins/cli.nix +++ b/mixins/cli.nix @@ -5,9 +5,6 @@ inputs, ... }: { - imports = [ - inputs.home-manager.nixosModules."home-manager" - ]; config = { home-manager.users.tzlil = { pkgs, @@ -15,6 +12,9 @@ nixosConfig, ... } @ hm: { + imports = [ + # inputs.viper-nix-common.homeModules.xdg + ]; home = { packages = with pkgs; [ rsync @@ -22,8 +22,13 @@ ripgrep bat croc + (pkgs.python3.withPackages (ps: with ps; [ + requests + ])) ]; - # sessionVariables.EDITOR = "nvim"; + sessionVariables = { + EDITOR = "nvim"; + }; }; programs = { git = { diff --git a/mixins/dev.nix b/mixins/dev.nix index 5d9487c..e25034e 100644 --- a/mixins/dev.nix +++ b/mixins/dev.nix @@ -2,12 +2,8 @@ pkgs, lib, config, - inputs, ... }: { - imports = [ - inputs.home-manager.nixosModules."home-manager" - ]; config = { home-manager.users.tzlil = {pkgs, ...} @ hm: { home = { diff --git a/mixins/emacs/default.nix b/mixins/emacs/default.nix index 7303ebb..27e1106 100644 --- a/mixins/emacs/default.nix +++ b/mixins/emacs/default.nix @@ -6,7 +6,6 @@ ... }: { imports = [ - inputs.home-manager.nixosModules."home-manager" ]; config = { home-manager.users.tzlil = { diff --git a/mixins/sway.nix b/mixins/sway.nix index 09fc857..42dfc73 100644 --- a/mixins/sway.nix +++ b/mixins/sway.nix @@ -280,12 +280,12 @@ in { bindsym --locked XF86AudioStop exec ${pkgs.playerctl}/bin/playerctl stop for_window [app_id="^menu$"] floating enable, border none - for_window [app_id="mpv"] sticky enable - for_window [floating] border csd - for_window [app_id="firefox" title="Picture-in-Picture"] floating enable, sticky enable, border none - for_window [app_id="imv"] floating enable - for_window [app_id="imv"] floating enable - for_window [class="PacketTracer"] floating enable + #for_window [app_id="mpv"] sticky enable + #for_window [floating] border csd + #for_window [app_id="firefox" title="Picture-in-Picture"] floating enable, sticky enable, border none + #for_window [app_id="imv"] floating enable + #for_window [app_id="imv"] floating enable + #for_window [class="PacketTracer"] floating enable bindsym XF86MonBrightnessUp exec ${pkgs.brightnessctl}/bin/brightnessctl s +5% bindsym XF86MonBrightnessDown exec ${pkgs.brightnessctl}/bin/brightnessctl s 5%- @@ -294,9 +294,9 @@ in { exec_always ${pkgs.kanshi}/bin/kanshi >/tmp/kanshi.log 2>&1 - default_border pixel 2 - gaps outer 5 - gaps inner 5 + default_border pixel 0 + gaps outer 0 + gaps inner 0 include /etc/sway/config.d/* ''; }; diff --git a/profiles/user.nix b/profiles/user.nix index 858a36a..73c4fcb 100644 --- a/profiles/user.nix +++ b/profiles/user.nix @@ -5,9 +5,6 @@ inputs, ... }: { - imports = [ - inputs.home-manager.nixosModules."home-manager" - ]; config = { age.secrets.id_ed25519 = { file = ../secrets/id_ed25519.age; |