From f05fcc34b82512c7a40f8956b4b1a8fb757a7e98 Mon Sep 17 00:00:00 2001 From: emily Date: Wed, 28 Feb 2024 22:43:20 +0100 Subject: [PATCH] fixes --- README.md | 15 +++++++++ config/common/users/emily/default.nix | 4 ++- config/profiles/graphical/default.nix | 32 +++++++++++++++---- .../graphical/files/rofi/confirm.rasi | 1 - .../graphical/files/rofi/launcher.rasi | 1 - .../graphical/files/rofi/powermenu.rasi | 1 - .../profiles/graphical/files/rofi/runner.rasi | 1 - .../graphical/files/rofi/screenshot.rasi | 1 - .../graphical/files/rofi/shared/fonts.rasi | 3 -- config/profiles/graphical/nixvim.nix | 15 +++++++-- 10 files changed, 55 insertions(+), 19 deletions(-) delete mode 100644 config/profiles/graphical/files/rofi/shared/fonts.rasi diff --git a/README.md b/README.md index b877f5c..772690a 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,25 @@ ## First deployment +### remote hosts + ```console $ nix run github:nix-community/nixos-anywhere -- --flake ".#" root@ ``` +### desktops + + +```console +$ nix --extra-experimental-features nix-command run github:nix-community/nixos-anywhere -- --flake "git+https://git.bsd.gay/snaki/nixfiles.git#" --no-reboot --build-on-target root@127.0.0.1 +$ nixos-enter +$ passwd +reboot +$ git clone https://git.bsd.gay/snaki/nixfiles.git +$ colmena apply-local --sudo --node +``` + + ## Deploy changes on ... ### all hosts diff --git a/config/common/users/emily/default.nix b/config/common/users/emily/default.nix index 3b4d339..157f57a 100644 --- a/config/common/users/emily/default.nix +++ b/config/common/users/emily/default.nix @@ -24,6 +24,7 @@ htop restic ] ++ lib.optionals config.kyouma.machine-type.graphical [ + colmena thunderbird obsidian krita @@ -40,10 +41,11 @@ slurp grim gnome.simple-scan - gnome.nautilus + cinnamon.nemo imagemagick_light #ubuntu_font_family + (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) jetbrains-mono font-awesome ]; diff --git a/config/profiles/graphical/default.nix b/config/profiles/graphical/default.nix index b478070..63d067d 100644 --- a/config/profiles/graphical/default.nix +++ b/config/profiles/graphical/default.nix @@ -9,6 +9,8 @@ deployment.allowLocalDeployment = true; hardware.opengl.enable = true; + + boot.plymouth.enable = true; services.geoclue2.enable = true; @@ -25,7 +27,11 @@ MOZ_ENABLE_WAYLAND = "1"; CLUTTER_BACKEND = "wayland"; }; - xdg.portal.wlr.enable = true; + xdg.portal = { + enable = true; + wlr.enable = true; + configPackages = [ pkgs.xdg-desktop-portal-hyprland ]; + }; stylix= { image = pkgs.fetchurl { @@ -42,7 +48,7 @@ serif = config.stylix.fonts.sansSerif; monospace = { package = pkgs.jetbrains-mono; - name = "JetBrainsMono-Regular"; + name = "JetBrains Mono Regular"; }; sizes.terminal = 11; }; @@ -53,6 +59,7 @@ }; targets = { console.enable = false; + gnome.enable = true; fish.enable = false; }; }; @@ -398,6 +405,8 @@ }; programs.imv.enable = true; + + programs.swaylock.enable = true; programs.wpaperd = { enable = true; @@ -465,11 +474,11 @@ cpu = { format = " {usage:02}"; interval = 2; - on-click = "kitty -e htop"; + on-click = "${pkgs.kitty}/bin/kitty -e ${pkgs.htop}/bin/htop"; }; memory = { format = " {used:0.2f}"; - on-click = "kitty -e htop"; + on-click = "${pkgs.kitty}/bin/kitty -e ${pkgs.htop}/bin/htop"; }; temperature = { hwmon-path = "/sys/class/hwmon/hwmon1/temp1_input"; @@ -488,9 +497,9 @@ warning = 30; critical = 15; }; - format = "\uf1e6"; + format = ""; format-discharging = "{icon} {capacity: >3}% {power:0.1f}W"; - format-charging = "\uf1e6 {capacity: >3}% {power:0.1f}W"; + format-charging = " {capacity: >3}% {power:0.1f}W"; interval = 3; format-icons = ["" "" "" "" ""]; }; @@ -499,7 +508,7 @@ format-wifi = " {essid}"; format-ethernet = " Wired"; format-disconnected = "⚠ Disconnected"; - on-click = "${networkmanagerapplet}/bin/nm-connection-editor"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; }; pulseaudio = { scroll-step = 5; @@ -623,6 +632,15 @@ services.syncthing = { enable = true; tray.enable = true; + tray.command = "syncthingtray --wait"; + }; + services.udiskie = { + enable = true; + automount = false; + }; + systemd.user.targets.tray.Unit = { + BindsTo = "waybar.service"; + After = "waybar.service"; }; }; } diff --git a/config/profiles/graphical/files/rofi/confirm.rasi b/config/profiles/graphical/files/rofi/confirm.rasi index 76d7c36..45dc0ac 100644 --- a/config/profiles/graphical/files/rofi/confirm.rasi +++ b/config/profiles/graphical/files/rofi/confirm.rasi @@ -5,7 +5,6 @@ configuration { /*****----- Global Properties -----*****/ @import "shared/colors.rasi" -@import "shared/fonts.rasi" /* USE_ICON=YES diff --git a/config/profiles/graphical/files/rofi/launcher.rasi b/config/profiles/graphical/files/rofi/launcher.rasi index eb9db2a..6d68674 100644 --- a/config/profiles/graphical/files/rofi/launcher.rasi +++ b/config/profiles/graphical/files/rofi/launcher.rasi @@ -14,7 +14,6 @@ configuration { /*****----- Global Properties -----*****/ @import "shared/colors.rasi" -@import "shared/fonts.rasi" /*****----- Main Window -----*****/ window { diff --git a/config/profiles/graphical/files/rofi/powermenu.rasi b/config/profiles/graphical/files/rofi/powermenu.rasi index c29f520..8dde209 100644 --- a/config/profiles/graphical/files/rofi/powermenu.rasi +++ b/config/profiles/graphical/files/rofi/powermenu.rasi @@ -5,7 +5,6 @@ configuration { /*****----- Global Properties -----*****/ @import "shared/colors.rasi" -@import "shared/fonts.rasi" /*****----- Main Window -----*****/ diff --git a/config/profiles/graphical/files/rofi/runner.rasi b/config/profiles/graphical/files/rofi/runner.rasi index f73d45b..dde2854 100644 --- a/config/profiles/graphical/files/rofi/runner.rasi +++ b/config/profiles/graphical/files/rofi/runner.rasi @@ -14,7 +14,6 @@ configuration { /*****----- Global Properties -----*****/ @import "shared/colors.rasi" -@import "shared/fonts.rasi" /*****----- Main Window -----*****/ window { diff --git a/config/profiles/graphical/files/rofi/screenshot.rasi b/config/profiles/graphical/files/rofi/screenshot.rasi index 25367e4..c6ac3fc 100644 --- a/config/profiles/graphical/files/rofi/screenshot.rasi +++ b/config/profiles/graphical/files/rofi/screenshot.rasi @@ -9,7 +9,6 @@ configuration { /*****----- Global Properties -----*****/ @import "shared/colors.rasi" -@import "shared/fonts.rasi" /* USE_ICON=YES diff --git a/config/profiles/graphical/files/rofi/shared/fonts.rasi b/config/profiles/graphical/files/rofi/shared/fonts.rasi deleted file mode 100644 index aca34da..0000000 --- a/config/profiles/graphical/files/rofi/shared/fonts.rasi +++ /dev/null @@ -1,3 +0,0 @@ -{ - font: "Iosevka Nerd Font 10"; -} diff --git a/config/profiles/graphical/nixvim.nix b/config/profiles/graphical/nixvim.nix index 89e7889..8c89ac1 100644 --- a/config/profiles/graphical/nixvim.nix +++ b/config/profiles/graphical/nixvim.nix @@ -4,7 +4,7 @@ ]; home-manager.users.emily.programs.nixvim = { enable = true; - extraPlugins = [ pkgs.vimPlugins.molokai ]; + extraPlugins = [ pkgs.vimPlugins.molokai vimPlugins.vim-airline-themes ]; colorscheme = "molokai"; vimAlias = true; highlightOverride.Normal = { @@ -164,7 +164,15 @@ servers = { bashls.enable = true; lua-ls.enable = true; - nixd.enable = true; + nixd = { + enable = true; + settings = { + eval.depth = 5; + eval.workers = 6; + formatting.command = "nixpkgs-fmt"; + options.enable = true; + }; + }; ruff-lsp.enable = true; }; }; @@ -190,13 +198,14 @@ nixGrammars = true; indent = true; }; + plugins.airline.enable = true; plugins.cmp-buffer.enable = true; plugins.cmp-emoji.enable = true; plugins.cmp-nvim-lsp.enable = true; plugins.cmp-path.enable = true; plugins.cmp_luasnip.enable = true; plugins.luasnip.enable = true; - plugins.lightline.enable = true; + plugins.nvim-autopairs.enable = true; plugins.rainbow-delimiters.enable = true; plugins.rustaceanvim.enable = true; plugins.treesitter-context.enable = true;