From 2ea78bdd47d3ae59b7d90e71e1f76bdc0e1582d4 Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 10 Apr 2023 18:37:28 +1000 Subject: [PATCH] first phase of flake conversion --- flake-todo | 2 + flake/flake.nix | 98 ++++-- flake/home/bolt.nix | 6 + flake/home/dots/Xresources | 37 +++ {home => flake/home}/dots/eww/colors.scss | 0 {home => flake/home}/dots/fuzzel/fuzzel.ini | 0 .../home}/dots/hyprland/hyprland.conf | 4 +- {home => flake/home}/dots/swaync/config.json | 0 .../home}/dots/swaync/configSchema.json | 0 {home => flake/home}/dots/swaync/style.css | 0 {home => flake/home}/dots/wlogout/layout | 0 {home => flake/home}/dots/wlogout/style.css | 0 flake/home/dots/zsh | 42 +++ flake/home/home.nix | 284 ++++++++++++++++++ .../home/programs/eww/README.md | 0 .../home/programs/eww/css/_calendar.scss | 0 .../home/programs/eww/css/_colors.scss | 0 .../home/programs/eww/css/_music.scss | 0 .../home/programs/eww/css/_osd.scss | 0 .../home/programs/eww/css/_sidebar.scss | 0 .../home/programs/eww/css/_system.scss | 0 .../home/programs/eww/css/_volume.scss | 0 .../home/programs/eww/default.nix | 1 - .../home/programs/eww/eww.scss | 0 .../home/programs/eww/eww.yuck | 0 .../home/programs/eww/modules/bluetooth.yuck | 0 .../home/programs/eww/modules/bright.yuck | 0 .../home/programs/eww/modules/clock.yuck | 0 .../programs/eww/modules/current_win.yuck | 0 .../home/programs/eww/modules/music.yuck | 0 .../home/programs/eww/modules/net.yuck | 0 .../home/programs/eww/modules/sys.yuck | 0 .../home/programs/eww/modules/variables.yuck | 0 .../home/programs/eww/modules/volume.yuck | 0 .../home/programs/eww/modules/workspaces.yuck | 0 .../home/programs/eww/scripts/airplane | 0 .../home/programs/eww/scripts/battery | 0 .../home/programs/eww/scripts/bluetooth | 0 .../home/programs/eww/scripts/brightness | 0 .../home/programs/eww/scripts/current_win | 0 .../home/programs/eww/scripts/memory | 0 .../home/programs/eww/scripts/music | 0 .../home/programs/eww/scripts/net | 0 .../home/programs/eww/scripts/volume | 0 .../home/programs/eww/scripts/workspaces | 0 .../home/programs/eww/windows/calendar.yuck | 0 .../home/programs/eww/windows/music.yuck | 0 .../home/programs/eww/windows/osd.yuck | 0 .../programs/eww/windows/system-menu.yuck | 0 home/bolt.nix | 3 - home/home.nix | 18 +- system/configuration.nix | 14 +- system/quiver.nix | 32 +- 53 files changed, 491 insertions(+), 50 deletions(-) create mode 100644 flake-todo create mode 100644 flake/home/bolt.nix create mode 100644 flake/home/dots/Xresources rename {home => flake/home}/dots/eww/colors.scss (100%) rename {home => flake/home}/dots/fuzzel/fuzzel.ini (100%) rename {home => flake/home}/dots/hyprland/hyprland.conf (99%) rename {home => flake/home}/dots/swaync/config.json (100%) rename {home => flake/home}/dots/swaync/configSchema.json (100%) rename {home => flake/home}/dots/swaync/style.css (100%) rename {home => flake/home}/dots/wlogout/layout (100%) rename {home => flake/home}/dots/wlogout/style.css (100%) create mode 100644 flake/home/dots/zsh create mode 100644 flake/home/home.nix rename {foreign/dotfiles => flake}/home/programs/eww/README.md (100%) rename {foreign/dotfiles => flake}/home/programs/eww/css/_calendar.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/css/_colors.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/css/_music.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/css/_osd.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/css/_sidebar.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/css/_system.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/css/_volume.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/default.nix (99%) rename {foreign/dotfiles => flake}/home/programs/eww/eww.scss (100%) rename {foreign/dotfiles => flake}/home/programs/eww/eww.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/bluetooth.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/bright.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/clock.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/current_win.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/music.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/net.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/sys.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/variables.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/volume.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/modules/workspaces.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/airplane (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/battery (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/bluetooth (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/brightness (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/current_win (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/memory (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/music (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/net (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/volume (100%) rename {foreign/dotfiles => flake}/home/programs/eww/scripts/workspaces (100%) rename {foreign/dotfiles => flake}/home/programs/eww/windows/calendar.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/windows/music.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/windows/osd.yuck (100%) rename {foreign/dotfiles => flake}/home/programs/eww/windows/system-menu.yuck (100%) diff --git a/flake-todo b/flake-todo new file mode 100644 index 0000000..a418040 --- /dev/null +++ b/flake-todo @@ -0,0 +1,2 @@ +all systems flakes +do overlays properly for syspkgs/homepkgs diff --git a/flake/flake.nix b/flake/flake.nix index 2cf76ee..12f642d 100644 --- a/flake/flake.nix +++ b/flake/flake.nix @@ -1,5 +1,5 @@ { - description = "master home systems config"; + description = "nixos config"; inputs = { @@ -10,11 +10,17 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; - eww = { - url = "github:elkowar/eww"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; - }; + # eww = { + # url = "github:elkowar/eww"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.rust-overlay.follows = "rust-overlay"; + # }; + + # rust-overlay = { + # url = "github:oxalica/rust-overlay"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.flake-utils.follows = "flake-utils"; + # }; flake-utils.url = "github:numtide/flake-utils"; @@ -31,27 +37,77 @@ hyprland.url = "github:hyprwm/Hyprland"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - }; - outputs = inputs@{ flake-parts, ... }: - inputs.flake-parts.lib.mkFlake {inherit inputs;} { + outputs = { self, nixpkgs, home-manager, eww, helix, hyprland, ... }@inputs: + let - systems = ["x86_64-linux"]; - - imports = [ - + inherit (self) outputs: + forAllSystems = nixpkgs.lib.genAttrs [ + "x86_64-linux" ]; - perSystem = {config, self', inputs', pkgs, system, ...}: { - + in + rec { + + # custom packages + syspkgs = forAllSystems (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in import ./syspkgs { inherit pkgs; } + ); + + homepkgs = forAllSystems (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in import ./homepkgs { inherit pkgs; } + ); + + # any overlays or modules we use + # overlays = import ./overlays { inherit inputs; }; + # nixosModules = import ./modules/nixos; + # homeModules = import ./modules/home; + + nixosConfigurations = { + + "quiver" = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ + ./system/configuration.nix + ./system/quiver.nix + ]; + }; + + "adrift" = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ + ./system/configuration.nix + ./system/adrift.nix + ] + }; + + }; + + homeConfigurations = { + + "bolt@quiver" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { inherit inputs outputs; }; + modules = [ + ./home/home.nix + ./home/bolt.nix + ]; + }; + + "plank@adrift" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { inherit inputs outputs; }; + modules = [ + ./home/home.nix + ./home/plank.nix + ]; + + }; + }; - }; } diff --git a/flake/home/bolt.nix b/flake/home/bolt.nix new file mode 100644 index 0000000..d0da7dd --- /dev/null +++ b/flake/home/bolt.nix @@ -0,0 +1,6 @@ +{ inputs, outputs, lib, config, pkgs, ... }: { + home = { + username = "bolt"; + homeDirectory = "/home/bolt"; + }; +} diff --git a/flake/home/dots/Xresources b/flake/home/dots/Xresources new file mode 100644 index 0000000..af1d2c9 --- /dev/null +++ b/flake/home/dots/Xresources @@ -0,0 +1,37 @@ + +! special +*.foreground: #d3dae3 +*.background: #181b28 +*.cursorColor: #d3dae3 + +! black +*.color0: #2f343f +*.color8: #1e2233 + +! red +*.color1: #ed244e +*.color9: #da4453 + +! green +*.color2: #27ae60 +*.color10: #71f79f + +! yellow +*.color3: #f67400 +*.color11: #fdbc4b + +! blue +*.color4: #2980b9 +*.color12: #1d99f3 + +! magenta +*.color5: #c50ed2 +*.color13: #9b59b6 + +! cyan +*.color6: #3daee9 +*.color14: #5294e2 + +! white +*.color7: #a1a9b1 +*.color15: #656a73 \ No newline at end of file diff --git a/home/dots/eww/colors.scss b/flake/home/dots/eww/colors.scss similarity index 100% rename from home/dots/eww/colors.scss rename to flake/home/dots/eww/colors.scss diff --git a/home/dots/fuzzel/fuzzel.ini b/flake/home/dots/fuzzel/fuzzel.ini similarity index 100% rename from home/dots/fuzzel/fuzzel.ini rename to flake/home/dots/fuzzel/fuzzel.ini diff --git a/home/dots/hyprland/hyprland.conf b/flake/home/dots/hyprland/hyprland.conf similarity index 99% rename from home/dots/hyprland/hyprland.conf rename to flake/home/dots/hyprland/hyprland.conf index a442607..f620a54 100644 --- a/home/dots/hyprland/hyprland.conf +++ b/flake/home/dots/hyprland/hyprland.conf @@ -21,8 +21,8 @@ input { general { layout=dwindle border_size=3 - gaps_in=10 - gaps_out=20 + gaps_in=15 + gaps_out=25 resize_on_border=true hover_icon_on_border=true col.active_border=0xffa1a9b1 diff --git a/home/dots/swaync/config.json b/flake/home/dots/swaync/config.json similarity index 100% rename from home/dots/swaync/config.json rename to flake/home/dots/swaync/config.json diff --git a/home/dots/swaync/configSchema.json b/flake/home/dots/swaync/configSchema.json similarity index 100% rename from home/dots/swaync/configSchema.json rename to flake/home/dots/swaync/configSchema.json diff --git a/home/dots/swaync/style.css b/flake/home/dots/swaync/style.css similarity index 100% rename from home/dots/swaync/style.css rename to flake/home/dots/swaync/style.css diff --git a/home/dots/wlogout/layout b/flake/home/dots/wlogout/layout similarity index 100% rename from home/dots/wlogout/layout rename to flake/home/dots/wlogout/layout diff --git a/home/dots/wlogout/style.css b/flake/home/dots/wlogout/style.css similarity index 100% rename from home/dots/wlogout/style.css rename to flake/home/dots/wlogout/style.css diff --git a/flake/home/dots/zsh b/flake/home/dots/zsh new file mode 100644 index 0000000..0df3f20 --- /dev/null +++ b/flake/home/dots/zsh @@ -0,0 +1,42 @@ +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +la_culr() +{ + ls -lha --group-directories-first --color $@ | culr +} + +ls_culr() +{ + ls -lh --group-directories-first --color $@ | culr +} + +ps_culr() +{ + ps ww$@ | culr +} + +alias ...=\"cd ../..\" +alias ....=\"cd ../../..\" +alias .....=\"cd ../../../..\" + +alias fresh=\"clear; echo; ~/.nix/header.sh\" +alias icat=\"kitty +kitten icat\" +alias chmox=\"chmod +x\" +alias gs=\"git status\" +alias gcl=\"git clone\" +alias ga=\"git add\" +alias gcb=\"git checkout -b\" +alias gco=\"git checkout\" +alias gl=\"git pull\" +alias gp=\"git push\" +alias gd=\"git diff\" +alias gcam=\"git commit -am\" +alias gcm=\"git commit -m\" +alias gr=\"git restore\" +alias gm=\"git merge\" +alias l=\"ls_culr\" +alias la=\"la_culr\" +alias p=\"ps_culr\" +alias mnt=\"mount | column -t | culr\" +alias kaboom=\"printf 'type any input if you wish to update\n\npress enter to continue\n'; read upgrade; if [ -n \\\"\\\$upgrade\\\" ]; then echo upgrading..; sudo nix-channel --update; else echo no upgrade!; fi; sudo nixos-rebuild switch -j9 && rm ~/.gtkrc-2.0; home-manager switch && sudo nix-collect-garbage && nix-store --optimise\" +fresh diff --git a/flake/home/home.nix b/flake/home/home.nix new file mode 100644 index 0000000..ad87af2 --- /dev/null +++ b/flake/home/home.nix @@ -0,0 +1,284 @@ +{ inputs, outputs, lib, config, pkgs, ... }: + +let + wlogout_style_base = dots/wlogout/style.css; + wlogout_style = pkgs.runCommandLocal "wlogout_style_base" {wlogpath = lib.strings.escape ["/"] "${pkgs.wlogout}";} '' + cp ${wlogout_style_base} $out + sed -i "s/\/usr\/share\/wlogout/$wlogpath\/share\/wlogout/g" $out + sed -i "s/\/etc\/wlogout/$wlogpath\/etc\/wlogout/g" $out + ''; +in +{ + + imports = [ + inputs.hyprland.homeManagerModules.default + ./programs/eww/default.nix + ]; + + nixpkgs = { + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + }; + + + home.stateVersion = "22.11"; + + home.packages = with pkgs; [ + thunderbird + clementine + inkscape + + btop + bat + joshuto + ripgrep + fd + lazygit + fzf + zoxide + zellij + glib # for gsettings + fuzzel + grim + slurp + swaybg + wlogout + wf-recorder + libnotify + xorg.xrdb + swayidle + swaynotificationcenter + # swayosd + waylock + playerctl + + kdeconnect + syncthing + keepassxc + + direnv + + mpv + + meslo-lgs-nf + + libsForQt5.qtstyleplugin-kvantum + + gtk-engine-murrine + ]; + + services.syncthing = { + enable = true; + }; + + wayland.windowManager.hyprland = { + enable = true; + systemdIntegration = true; + nvidiaPatches = true; + xwayland = { + enable = true; + hidpi = false; + }; + recommendedEnvironment = true; + extraConfig = builtins.readFile dots/hyprland/hyprland.conf; + }; + + programs.eww-hyprland = { + enable = true; + colors = builtins.readFile dots/eww/colors.scss; + }; + + systemd.user.startServices = "sd-switch"; + systemd.user.services."hyprland-system76" = { + Unit = { + Description = "the hyprland process scheduler hook"; + Requires = [ "dbus.service" ]; + }; + Install = { + WantedBy = [ "graphical-session.target" "default.target" ]; + }; + Service = { + ExecStart = ''${pkgs.hyprland-s76}/bin/hyprland-system76-scheduler-hook.sh''; + }; + }; + + xresources.extraConfig = builtins.readFile ./dots/Xresources; + + xdg.enable = true; + xdg.configFile = builtins.mapAttrs (name: value: { enable=true; text=builtins.readFile value; }) + { + "wlogout/layout" = dots/wlogout/layout; + "wlogout/style.css" = wlogout_style; + "swaync/config.json" = dots/swaync/config.json; + "swaync/configSchema.json" = dots/swaync/configSchema.json; + "swaync/style.css" = dots/swaync/style.css; + "fuzzel/fuzzel.ini" = dots/fuzzel/fuzzel.ini; + }; + + xdg.systemDirs.data = [ + "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}" + "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" + ]; + + home.sessionVariables = { + GTK_THEME = "Sweet-Dark"; + }; + + gtk = { + enable = true; + theme = { + package = pkgs.sweet; + name = "Sweet-Dark"; + }; + iconTheme = { + package = pkgs.papirus-icon-theme; + name = "Papirus-Dark"; + }; + }; + + programs.direnv = { + enable = true; + nix-direnv = { + enable = true; + }; + }; + + programs.firefox = + { + enable = true; + profiles.default = { + id = 0; + name = "Default"; + settings = { + "browser.startup.homepage" = "about:blank"; + }; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + vimium-c + darkreader + localcdn + ublock-origin + plasma-integration + keepassxc-browser + user-agent-string-switcher + ]; + }; + }; + + programs.helix.enable = true; + programs.helix.settings = { + theme = "gruvbox_dark_hard"; + editor.lsp.display-messages = true; + }; + + programs.kitty = { + enable = true; + font = { + name = "Ellograph CF"; + size = 10; + }; + settings = { + foreground = "#d3dae3"; + background = "#060604"; + cursor = "#d3dae3"; + selection_foreground = "#fdbc4b"; + selection_background = "#1e2233"; + color0 = "#2f343f"; + color1 = "#ed244e"; + color2 = "#27ae60"; + color3 = "#f67400"; + color4 = "#2980b9"; + color5 = "#c50ed2"; + color6 = "#3daee9"; + color7 = "#a1a9b1"; + color8 = "#1e2233"; + color9 = "#da4453"; + color10 = "#71f79f"; + color11 = "#fdbc4b"; + color12 = "#1d99f3"; + color13 = "#9b59b6"; + color14 = "#5294e2"; + color15 = "#656a73"; + }; + }; + + programs.git = { + enable = true; + userName = "atagen"; + userEmail = "atagen@boss.co"; + extraConfig = { + credential.helper = "keepassxc"; + }; + }; + + programs.fzf = { + enable = true; + enableZshIntegration = true; + }; + + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableCompletion = true; + enableSyntaxHighlighting = true; + enableVteIntegration = true; + autocd = true; + defaultKeymap = "viins"; + initExtra = builtins.readFile ./dots/zsh; + plugins = [ + { + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + } + { + name = "zsh-vi-mode"; + src = pkgs.zsh-vi-mode; + file = "share/zsh-vi-mode/zsh-vi-mode.zsh"; + } + { + name = "zsh-autopair"; + src = pkgs.zsh-autopair; + file = "share/zsh-autopair/zsh-autopair.zsh"; + } + { + name = "zsh-completions"; + src = pkgs.zsh-completions; + file = "share/zsh-completions/zsh-completions.zsh"; + } + { + name = "zsh-command-time"; + src = pkgs.zsh-command-time; + file = "share/zsh-completions/zsh-command-time.zsh"; + } + { + name = "zsh-autocomplete"; + src = pkgs.zsh-autocomplete; + file = "share/zsh-autocomplete/zsh-autocomplete.zsh"; + } + { + name = "zsh-fast-syntax-highlighting"; + src = pkgs.zsh-fast-syntax-highlighting; + file = "share/zsh-fast-syntax-highlighting/zsh-fast-syntax-highlighting.zsh"; + } + { + name = "zsh-nix-shell"; + src = pkgs.zsh-nix-shell; + file = "share/zsh-nix-shell/zsh-nix-shell.zsh"; + } + { + name = "any-nix-shell"; + src = pkgs.any-nix-shell; + file = "share/any-nix-shell/any-nix-shell.zsh"; + } + { + name = "nix-zsh-completions"; + src = pkgs.nix-zsh-completions; + file = "share/nix-zsh-completions/nix-zsh-completions.zsh"; + } + ]; + }; + + +} \ No newline at end of file diff --git a/foreign/dotfiles/home/programs/eww/README.md b/flake/home/programs/eww/README.md similarity index 100% rename from foreign/dotfiles/home/programs/eww/README.md rename to flake/home/programs/eww/README.md diff --git a/foreign/dotfiles/home/programs/eww/css/_calendar.scss b/flake/home/programs/eww/css/_calendar.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/css/_calendar.scss rename to flake/home/programs/eww/css/_calendar.scss diff --git a/foreign/dotfiles/home/programs/eww/css/_colors.scss b/flake/home/programs/eww/css/_colors.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/css/_colors.scss rename to flake/home/programs/eww/css/_colors.scss diff --git a/foreign/dotfiles/home/programs/eww/css/_music.scss b/flake/home/programs/eww/css/_music.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/css/_music.scss rename to flake/home/programs/eww/css/_music.scss diff --git a/foreign/dotfiles/home/programs/eww/css/_osd.scss b/flake/home/programs/eww/css/_osd.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/css/_osd.scss rename to flake/home/programs/eww/css/_osd.scss diff --git a/foreign/dotfiles/home/programs/eww/css/_sidebar.scss b/flake/home/programs/eww/css/_sidebar.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/css/_sidebar.scss rename to flake/home/programs/eww/css/_sidebar.scss diff --git a/foreign/dotfiles/home/programs/eww/css/_system.scss b/flake/home/programs/eww/css/_system.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/css/_system.scss rename to flake/home/programs/eww/css/_system.scss diff --git a/foreign/dotfiles/home/programs/eww/css/_volume.scss b/flake/home/programs/eww/css/_volume.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/css/_volume.scss rename to flake/home/programs/eww/css/_volume.scss diff --git a/foreign/dotfiles/home/programs/eww/default.nix b/flake/home/programs/eww/default.nix similarity index 99% rename from foreign/dotfiles/home/programs/eww/default.nix rename to flake/home/programs/eww/default.nix index 5e2eb52..c3c0a44 100644 --- a/foreign/dotfiles/home/programs/eww/default.nix +++ b/flake/home/programs/eww/default.nix @@ -35,7 +35,6 @@ wget wireplumber wlogout - socat fuzzel swaynotificationcenter ]; diff --git a/foreign/dotfiles/home/programs/eww/eww.scss b/flake/home/programs/eww/eww.scss similarity index 100% rename from foreign/dotfiles/home/programs/eww/eww.scss rename to flake/home/programs/eww/eww.scss diff --git a/foreign/dotfiles/home/programs/eww/eww.yuck b/flake/home/programs/eww/eww.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/eww.yuck rename to flake/home/programs/eww/eww.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/bluetooth.yuck b/flake/home/programs/eww/modules/bluetooth.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/bluetooth.yuck rename to flake/home/programs/eww/modules/bluetooth.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/bright.yuck b/flake/home/programs/eww/modules/bright.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/bright.yuck rename to flake/home/programs/eww/modules/bright.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/clock.yuck b/flake/home/programs/eww/modules/clock.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/clock.yuck rename to flake/home/programs/eww/modules/clock.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/current_win.yuck b/flake/home/programs/eww/modules/current_win.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/current_win.yuck rename to flake/home/programs/eww/modules/current_win.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/music.yuck b/flake/home/programs/eww/modules/music.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/music.yuck rename to flake/home/programs/eww/modules/music.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/net.yuck b/flake/home/programs/eww/modules/net.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/net.yuck rename to flake/home/programs/eww/modules/net.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/sys.yuck b/flake/home/programs/eww/modules/sys.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/sys.yuck rename to flake/home/programs/eww/modules/sys.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/variables.yuck b/flake/home/programs/eww/modules/variables.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/variables.yuck rename to flake/home/programs/eww/modules/variables.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/volume.yuck b/flake/home/programs/eww/modules/volume.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/volume.yuck rename to flake/home/programs/eww/modules/volume.yuck diff --git a/foreign/dotfiles/home/programs/eww/modules/workspaces.yuck b/flake/home/programs/eww/modules/workspaces.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/modules/workspaces.yuck rename to flake/home/programs/eww/modules/workspaces.yuck diff --git a/foreign/dotfiles/home/programs/eww/scripts/airplane b/flake/home/programs/eww/scripts/airplane similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/airplane rename to flake/home/programs/eww/scripts/airplane diff --git a/foreign/dotfiles/home/programs/eww/scripts/battery b/flake/home/programs/eww/scripts/battery similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/battery rename to flake/home/programs/eww/scripts/battery diff --git a/foreign/dotfiles/home/programs/eww/scripts/bluetooth b/flake/home/programs/eww/scripts/bluetooth similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/bluetooth rename to flake/home/programs/eww/scripts/bluetooth diff --git a/foreign/dotfiles/home/programs/eww/scripts/brightness b/flake/home/programs/eww/scripts/brightness similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/brightness rename to flake/home/programs/eww/scripts/brightness diff --git a/foreign/dotfiles/home/programs/eww/scripts/current_win b/flake/home/programs/eww/scripts/current_win similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/current_win rename to flake/home/programs/eww/scripts/current_win diff --git a/foreign/dotfiles/home/programs/eww/scripts/memory b/flake/home/programs/eww/scripts/memory similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/memory rename to flake/home/programs/eww/scripts/memory diff --git a/foreign/dotfiles/home/programs/eww/scripts/music b/flake/home/programs/eww/scripts/music similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/music rename to flake/home/programs/eww/scripts/music diff --git a/foreign/dotfiles/home/programs/eww/scripts/net b/flake/home/programs/eww/scripts/net similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/net rename to flake/home/programs/eww/scripts/net diff --git a/foreign/dotfiles/home/programs/eww/scripts/volume b/flake/home/programs/eww/scripts/volume similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/volume rename to flake/home/programs/eww/scripts/volume diff --git a/foreign/dotfiles/home/programs/eww/scripts/workspaces b/flake/home/programs/eww/scripts/workspaces similarity index 100% rename from foreign/dotfiles/home/programs/eww/scripts/workspaces rename to flake/home/programs/eww/scripts/workspaces diff --git a/foreign/dotfiles/home/programs/eww/windows/calendar.yuck b/flake/home/programs/eww/windows/calendar.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/windows/calendar.yuck rename to flake/home/programs/eww/windows/calendar.yuck diff --git a/foreign/dotfiles/home/programs/eww/windows/music.yuck b/flake/home/programs/eww/windows/music.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/windows/music.yuck rename to flake/home/programs/eww/windows/music.yuck diff --git a/foreign/dotfiles/home/programs/eww/windows/osd.yuck b/flake/home/programs/eww/windows/osd.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/windows/osd.yuck rename to flake/home/programs/eww/windows/osd.yuck diff --git a/foreign/dotfiles/home/programs/eww/windows/system-menu.yuck b/flake/home/programs/eww/windows/system-menu.yuck similarity index 100% rename from foreign/dotfiles/home/programs/eww/windows/system-menu.yuck rename to flake/home/programs/eww/windows/system-menu.yuck diff --git a/home/bolt.nix b/home/bolt.nix index 33d1274..24b5d4c 100755 --- a/home/bolt.nix +++ b/home/bolt.nix @@ -43,9 +43,7 @@ in { zellij xonotic nicotine-plus - glib # for gsettings - fuzzel grim slurp @@ -58,7 +56,6 @@ in { swaynotificationcenter swayosd waylock - playerctl ]; diff --git a/home/home.nix b/home/home.nix index 1b64720..5c2869f 100755 --- a/home/home.nix +++ b/home/home.nix @@ -28,7 +28,7 @@ in ]; home.packages = with pkgs; [ - + thunderbird clementine @@ -41,6 +41,21 @@ in fd lazygit fzf + zellij + glib # for gsettings + fuzzel + grim + slurp + swaybg + wlogout + wf-recorder + libnotify + xorg.xrdb + swayidle + swaynotificationcenter + swayosd + waylock + playerctl kdeconnect keepassxc @@ -165,7 +180,6 @@ in programs.kitty = { enable = true; - # package = kitty_notest; font = { name = "Ellograph CF"; size = 10; diff --git a/system/configuration.nix b/system/configuration.nix index 71bd4b0..7aaa84e 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -33,16 +33,8 @@ keep-derivations = true ''; - environment.sessionVariables = rec { - WLR_NO_HARDWARE_CURSORS = "1"; - GBM_BACKEND = "nvidia-drm"; - NVD_BACKEND = "direct"; - __GLX_VENDOR_LIBRARY_NAME = "nvidia"; - LIBVA_DRIVER_NAME = "nvidia"; - __GL_GSYNC_ALLOWED = "1"; - __GL_VRR_ALLOWED = "1"; - EDITOR = "hx"; - }; + + systemd.services.NetworkManager-wait-online.enable = false; environment.pathsToLink = [ "/share/zsh" ]; boot.loader.systemd-boot.enable = true; @@ -112,8 +104,8 @@ }; qt.enable = true; - qt.style = "kvantum"; qt.platformTheme = "qt5ct"; + qt.style = "kvantum"; programs.zsh.enable = true; users.defaultUserShell = pkgs.zsh; diff --git a/system/quiver.nix b/system/quiver.nix index 6543b23..02d0528 100755 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -40,6 +40,17 @@ in { hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + environment.sessionVariables = rec { + WLR_NO_HARDWARE_CURSORS = "1"; + GBM_BACKEND = "nvidia-drm"; + NVD_BACKEND = "direct"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + LIBVA_DRIVER_NAME = "nvidia"; + __GL_GSYNC_ALLOWED = "1"; + __GL_VRR_ALLOWED = "1"; + EDITOR = "hx"; + }; + virtualisation = { podman = { enable = true; @@ -57,16 +68,17 @@ in { }; }; - programs.hyprland = { - enable = true; - xwayland = { - enable = true; - hidpi = false; - }; - nvidiaPatches = true; - }; + # programs.hyprland = { + # enable = true; + # xwayland = { + # enable = true; + # hidpi = false; + # }; + # nvidiaPatches = true; + # }; + services.xserver.videoDrivers = [ "nvidia" ]; - hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; hardware.nvidia.modesetting.enable = true; hardware.nvidia.powerManagement.enable = true; programs.xwayland.enable = true; @@ -160,7 +172,7 @@ in { fileSystems."/data" = { device = "/dev/disk/by-uuid/39D4F78C658E8B56"; fsType = "ntfs"; - options = [ "rw" "uid=1001" "gid=100" ]; + options = [ "rw" "uid=1000" "gid=100" ]; }; # swapDevices = [ {