diff --git a/flake.nix b/flake.nix index f31cba0..5ba75b4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,10 @@ # TODO enable ability to switch between stable and unstable # TODO enable ability to include or exclude unfree software - #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; #home-manager.url = "github:nix-community/home-manager/release-23.05"; #home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/aliases.nix b/modules/aliases.nix index 88aaa56..54beb21 100644 --- a/modules/aliases.nix +++ b/modules/aliases.nix @@ -16,5 +16,5 @@ nup = "sudo nix-channel --update"; nuf = "sudo nix flake update --nix-path /etc/nixos"; ngc = "sudo nix-collect-garbage -d"; - wip = "curl -s 'https://nordvpn.com/wp-admin/admin-ajax.php?action=get_user_info_data' | jq"; + lsip = "curl -s 'https://nordvpn.com/wp-admin/admin-ajax.php?action=get_user_info_data' | jq"; } diff --git a/users/gandalf/modules/default.nix b/users/gandalf/modules/default.nix index 531bb73..a1a5182 100644 --- a/users/gandalf/modules/default.nix +++ b/users/gandalf/modules/default.nix @@ -9,7 +9,6 @@ ./packages.nix ./ssh.nix ./tmux.nix - ./udiskie.nix ./zsh.nix ]; } diff --git a/users/gandalf/modules/gui/i3/default.nix b/users/gandalf/modules/gui/i3/default.nix index 7b17b79..d241d11 100644 --- a/users/gandalf/modules/gui/i3/default.nix +++ b/users/gandalf/modules/gui/i3/default.nix @@ -20,6 +20,7 @@ in { pavucontrol # control audio playerctl # control player networkmanagerapplet # control network + udiskie # automount usb blueman # control bluetooth nextcloud-client # nextcloud client to connect to any instance plasma5Packages.kdeconnect-kde # sync phone and pc @@ -35,6 +36,7 @@ in { { command = "${feh}/bin/feh --bg-fill ${common.wallpaper}"; } { command = "${networkmanagerapplet}/bin/nm-applet"; } { command = "${blueman}/bin/blueman-applet"; } + { command = "${udiskie}/bin/udiskie --tray"; } { command = "${nextcloud-client}/bin/nextcloud"; } { command = "${plasma5Packages.kdeconnect-kde}/bin/kdeconnect-indicator"; } ]; diff --git a/users/gandalf/modules/gui/sway/default.nix b/users/gandalf/modules/gui/sway/default.nix index cf2d702..d93e6a3 100644 --- a/users/gandalf/modules/gui/sway/default.nix +++ b/users/gandalf/modules/gui/sway/default.nix @@ -19,6 +19,7 @@ in pavucontrol # control audio playerctl # control player networkmanagerapplet # control network + udiskie # automount usb dracula-theme # gtk theme gnome3.adwaita-icon-theme # default gnome cursors wl-clipboard # cli tool to manage wayland clipboard @@ -80,6 +81,7 @@ in { command = "${kanshi}/bin/kanshi"; } { command = "${networkmanagerapplet}/bin/nm-applet"; } { command = "${blueman}/bin/blueman-applet"; } + { command = "${udiskie}/bin/udiskie --tray"; } { command = "${swaynotificationcenter}/bin/swaync"; } { command = "${nextcloud-client}/bin/nextcloud"; } { command = "${plasma5Packages.kdeconnect-kde}/bin/kdeconnect-indicator"; } diff --git a/users/gandalf/modules/udiskie.nix b/users/gandalf/modules/udiskie.nix deleted file mode 100644 index 331ffab..0000000 --- a/users/gandalf/modules/udiskie.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: { - services.udiskie = { - enable = true; - tray = "always"; - }; -}