diff --git a/flake.lock b/flake.lock index 9a6ccd9..72f992b 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1661573386, - "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=", + "lastModified": 1661824092, + "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b", + "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1661698908, - "narHash": "sha256-CkdZIP11mxahqOuADBkuKFP/dokMn6mj2ZyiicJ2utU=", + "lastModified": 1661888127, + "narHash": "sha256-7oRh2X4lyykcFlHSppIo7fB1fuc8HguxxfZOTexkFQA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c757fa54e10bd0f486c70e32ecca366247281824", + "rev": "1cf46fd6a26cb16104a39a4fe73ca7ccd6c1ba36", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1661652237, - "narHash": "sha256-HYZazJYnrSvgTN26lSI5JC8iTxTeGb+MrbSDb+k6b6I=", + "lastModified": 1661824817, + "narHash": "sha256-rKKTjwIVRD5YyD4/X0HMgQkPunAI1rb9vwP2l3M7NWY=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "3982e2afdb23f980e07a473472bf333178a87a5c", + "rev": "835355ef3f51f9ba1a75a35315f997b189337d81", "type": "github" }, "original": { @@ -369,16 +369,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1661762682, - "narHash": "sha256-/i8xAhsX8MwiEucLIX+t7rNcsddFzbEOr/BROFSLeo4=", + "lastModified": 1661850929, + "narHash": "sha256-YQxPKEF1jpDIrNARAIdaU0pR1KgjBHuTwXDeAseTfnY=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "fab092ddd75ec258d0b46611ba1730f33d041b10", + "rev": "f9e6ebf0e94a0f82f6d913708a57b86dd4740cbd", "type": "github" }, "original": { "owner": "NULLx76", - "ref": "vscode-catppuccin", + "ref": "0x76", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fe68483..939fc13 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix inputs = { - nixpkgs.url = "github:NULLx76/nixpkgs/vscode-catppuccin"; + nixpkgs.url = "github:NULLx76/nixpkgs/0x76"; colmena.url = "github:zhaofengli/colmena"; colmena.inputs.nixpkgs.follows = "nixpkgs"; @@ -56,12 +56,7 @@ # Script to apply local colmena deployments apply-local = pkgs.writeScriptBin "apply-local" '' #!${pkgs.stdenv.shell} - "${colmena.packages.x86_64-linux.colmena}"/bin/colmena apply-local --sudo - ''; - - dump-dconf = pkgs.writeScriptBin "dump-dconf" '' - #!${pkgs.stdenv.shell} - dconf dump / | dconf2nix > nixos/hosts/thalassa/null/dconf.nix + "${colmena.packages.x86_64-linux.colmena}"/bin/colmena apply-local --sudo $@ ''; in { @@ -84,11 +79,8 @@ # Use by running `nix develop` devShells.${system}.default = pkgs.mkShell { VAULT_ADDR = "http://vault.olympus:8200/"; - # This only support bash so just execute zsh in bash as a workaround :/ - # shellHook = "zsh; exit $?"; buildInputs = with pkgs; [ apply-local - dump-dconf colmena.packages.x86_64-linux.colmena fluxcd k9s diff --git a/nixos/common/users/default.nix b/nixos/common/users/default.nix index 20a19bd..e597d6c 100644 --- a/nixos/common/users/default.nix +++ b/nixos/common/users/default.nix @@ -3,7 +3,7 @@ # Inputs to this NixOS module, in this case we are # using `pkgs` so we can have some user specific packages and config # to configure the root ssh key. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { # Setup ZSH to use grml config @@ -25,11 +25,14 @@ environment.pathsToLink = [ "/share/zsh" ]; # Install Neovim and set it as alias for vi(m) - programs.neovim.enable = true; - programs.neovim.viAlias = true; + programs.neovim = { + enable = true; + viAlias = true; + defaultEditor = true; + }; # Disable sudo prompt for `wheel` users. - security.sudo.wheelNeedsPassword = false; + security.sudo.wheelNeedsPassword = lib.mkDefault false; # The block that specifies my user account. users.extraUsers.victor = { diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index f7d5b9b..835bc4f 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -45,6 +45,10 @@ in inputs.hyprland.homeManagerModules.default ]; + security.pam.services.swaylock = { }; + + security.sudo.wheelNeedsPassword = true; + fonts = { fonts = with pkgs; [ material-design-icons @@ -190,6 +194,8 @@ in wireguard-tools slurp gdb + + swaylock-effects ]; programs.steam = { @@ -227,5 +233,4 @@ in # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "22.05"; # Did you read the comment? - } diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 8c2fa2a..a848ee7 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -11,33 +11,35 @@ ]; home.packages = with pkgs; [ + brightnessctl discord - rnix-lsp - fusee-launcher - neofetch + calibre + element-desktop-wayland fluxcd + fusee-launcher + gimp + gnome.eog + gnome.file-roller + gnome.gnome-font-viewer + gnome.nautilus + grim # Screenshot tool k9s kubectl + libnotify + neofetch nixpkgs-review + python3 + retroarchFull ripgrep + rnix-lsp rsync - rustup rust-analyzer + rustup steam-run texlive.combined.scheme-full - retroarchFull - python3 - element-desktop-wayland - - gnome.gnome-font-viewer - - wofi # Wayland rofi - grim # Screenshot tool wf-recorder # Screenrecorder wl-clipboard # Clipboard manager - networkmanager_dmenu - brightnessctl - libnotify + wofi # Wayland rofi ]; programs.foot = { @@ -132,32 +134,4 @@ }; services.syncthing.enable = true; - - home.file.".config/networkmanager-dmenu/config.ini".text = '' - [dmenu] - dmenu_command = wofi --dmenu -i - # # Note that dmenu_command can contain arguments as well like: - # # `dmenu_command = rofi -dmenu -i -theme nmdm` - # # `dmenu_command = rofi -dmenu -width 30 -i` - # # `dmenu_command = dmenu -i -l 25 -b -nb #909090 -nf #303030` - # (Default: False) use rofi highlighting instead of '==' - rofi_highlight = true - # compact = # (Default: False). Remove extra spacing from display - # pinentry = # (Default: None) e.g. `pinentry-gtk` - # wifi_chars = - wifi_chars = ▂▄▆█ - # list_saved = # (Default: False) list saved connections - - [dmenu_passphrase] - # # Uses the -password flag for Rofi, -x for bemenu. For dmenu, sets -nb and - # # -nf to the same color or uses -P if the dmenu password patch is applied - # # https://tools.suckless.org/dmenu/patches/password/ - # obscure = True - # obscure_color = #222222 - - [editor] - # terminal = - terminal = alacritty - # gui_if_available = (Default: True) - ''; } diff --git a/nixos/hosts/thalassa/null/home/hyprland/default.nix b/nixos/hosts/thalassa/null/home/hyprland/default.nix index ad162da..7cbff73 100644 --- a/nixos/hosts/thalassa/null/home/hyprland/default.nix +++ b/nixos/hosts/thalassa/null/home/hyprland/default.nix @@ -9,7 +9,7 @@ enable = true; extraConfig = '' exec-once=${pkgs.hyprpaper}/bin/hyprpaper - exec-once=hyprctl setcursor Catppuccin-Frappe-Pink-Cursors 32 + exec-once=hyprctlhyprpap setcursor Catppuccin-Frappe-Pink-Cursors 32 exec-once=eww daemon exec-once=eww open bar @@ -86,13 +86,6 @@ bind=SUPER,g,togglegroup bind=SUPER,tab,changegroupactive - # Firefox notifications - windowrule=float,title:^(\s*)$ - windowrule=move 1569 0,title:^(\s*)$ - windowrule=opacity 0.8,title:^(\s*)$ - windowrule=rounding 3,title:^(\s*)$ - windowrule=animation popin,title:^(\s*)$ - bind=,XF86MonBrightnessUp,exec,brightnessctl -q s +5% bind=,XF86MonBrightnessDown,exec,brightnessctl -q s 5%- bind=,XF86MonRaiseVolume,exec,pamixer -i 5