From 67b3e39735835c4e1c1455857fbae18cccc0de0e Mon Sep 17 00:00:00 2001 From: ISnortPennies Date: Mon, 23 Jan 2023 03:00:58 -0500 Subject: [PATCH] Pinned nix channels to flake specific flake inputs --- configuration.nix | 1 + flake.nix | 18 +- .../config/networkmanager-dmenu/config.ini | 25 --- .../networkmanager-dmenu/networkmenu.rasi | 154 ------------------ home-manager/config/rofi/config.rasi | 111 ------------- .../config/rofi/powermenu/powermenu.rasi | 67 -------- .../config/rofi/powermenu/powermenu.sh | 28 ---- .../config/rofi/window-switcher/box.rasi | 109 ------------- .../rofi/window-switcher/window-switcher.sh | 13 -- home-manager/home.nix | 1 - modules/packages.nix | 5 +- modules/scripts.nix | 1 + modules/xserver.nix | 1 + 13 files changed, 22 insertions(+), 512 deletions(-) delete mode 100644 home-manager/config/networkmanager-dmenu/config.ini delete mode 100644 home-manager/config/networkmanager-dmenu/networkmenu.rasi delete mode 100644 home-manager/config/rofi/config.rasi delete mode 100644 home-manager/config/rofi/powermenu/powermenu.rasi delete mode 100755 home-manager/config/rofi/powermenu/powermenu.sh delete mode 100644 home-manager/config/rofi/window-switcher/box.rasi delete mode 100755 home-manager/config/rofi/window-switcher/window-switcher.sh diff --git a/configuration.nix b/configuration.nix index 4a21510..20fe3e6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,6 +11,7 @@ variables = { EDITOR = "vi"; VISUAL = "vi"; + TERMINAL = "st"; }; }; #nix stuff diff --git a/flake.nix b/flake.nix index 8669f17..4908002 100644 --- a/flake.nix +++ b/flake.nix @@ -63,11 +63,27 @@ modules = [ ./configuration.nix ./systems/desktop.nix + { + environment.etc = { + "nix/inputs/nixpkgs".source = inputs.nixpkgs.outPath; + "nix/inputs/home-manager".source = inputs.home-manager.outPath; + }; + nix = { + nixPath = [ + "nixpkgs=/etc/nix/inputs/nixpkgs" + "home-manager=/etc/nix/inputs/home-manager" + ]; + registry = { + nixpkgs.flake = nixpkgs; + suckless.flake = suckless; + }; + }; + } home-manager.nixosModules.home-manager { home-manager = { useGlobalPkgs = true; - useUserPackages = true; + useUserPackages = false; extraSpecialArgs = {inherit spicetify-nix username;}; users = { ${username} = import ./home-manager/home.nix; diff --git a/home-manager/config/networkmanager-dmenu/config.ini b/home-manager/config/networkmanager-dmenu/config.ini deleted file mode 100644 index 9558aeb..0000000 --- a/home-manager/config/networkmanager-dmenu/config.ini +++ /dev/null @@ -1,25 +0,0 @@ -[dmenu] -dmenu_command = rofi -dmenu -theme ~/.config/networkmanager-dmenu/networkmenu.rasi -# dmenu_command = /usr/bin/dmenu -# # 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` -rofi_highlight = True -# compact = # (Default: False). Remove extra spacing from display -compact = True -# 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 = urxvt -gui_if_available = True diff --git a/home-manager/config/networkmanager-dmenu/networkmenu.rasi b/home-manager/config/networkmanager-dmenu/networkmenu.rasi deleted file mode 100644 index 56fe135..0000000 --- a/home-manager/config/networkmanager-dmenu/networkmenu.rasi +++ /dev/null @@ -1,154 +0,0 @@ -/* Copyright (C) 2020-2022 Aditya Shakya */ -/* Everyone is permitted to copy and distribute copies of this file under GNU-GPL3 */ - -configuration { - show-icons: false; - display-drun: ":"; - drun-display-format: "{name}"; - disable-history: false; - sidebar-mode: false; - location: 0; -} - -* { - BG: #000000; - BGA: #16161e; - FG: #c0caf5; - BDR: #7aa2f7; - SEL: #7aa2f7; - UGT: #db4b4b; - IMG: #db4b4b; - ON: #9ece6a; - OFF: #565f89; - font: "Sofia Pro 15"; -} -window { - transparency: "real"; - background-color: @BG; - text-color: @FG; - border-radius: 15px; - width: 400px; - height: 425px; -} - -prompt { - enabled: true; - padding: 4px 4px 6px 6px; - background-color: @BGA; - text-color: @FG; -} - -textbox-prompt-colon { - expand: false; - str: "󰖩"; - background-color: @BGA; - text-color: @IMG; - padding: 4px 0px 0px 8px; - font: "Material Design Icons Desktop 15"; -} - -inputbar { - children: [ textbox-prompt-colon, prompt, entry ]; - background-color: @BGA; - text-color: @FG; - expand: false; - border: 0px 0px 0px 0px; - border-radius: 10px; - border-color: @BDR; - margin: 0px 0px 0px 0px; - padding: 5px 0px 3px 0px; - position: center; -} - - -entry { - background-color: @BGA; - text-color: @FG; - placeholder-color: @FG; - expand: true; - horizontal-align: 0; - placeholder: ""; - blink: true; - padding: 4px 0px 0px 0px; -} - -case-indicator { - background-color: @BG; - text-color: @FG; - spacing: 0; -} - - -listview { - background-color: @BG; - columns: 1; - lines: 7; - spacing: 5px; - cycle: true; - dynamic: true; - layout: vertical; -} - -mainbox { - background-color: @BG; - children: [ inputbar, listview ]; - spacing: 10px; - padding: 10px; -} - -element { - background-color: @BG; - text-color: @FG; - orientation: horizontal; - border-radius: 10px; - padding: 6px 6px 6px 6px; -} - -element-icon { - background-color: inherit; - text-color: inherit; - horizontal-align: 0.5; - vertical-align: 0.5; - size: 24px; - border: 0px; -} - -element-text { - background-color: inherit; - text-color: inherit; - expand: true; - horizontal-align: 0; - vertical-align: 0; - margin: 2px 0px 2px 2px; -} - -element normal.urgent, -element alternate.urgent { - background-color: @UGT; - text-color: @FG; - border-radius: 10px; -} - -element normal.active, -element alternate.active { - background-color: @BGA; - text-color: @FG; -} - -element selected { - background-color: @SEL; - text-color: @BG; - border: 0px; - border-radius: 10px; - border-color: @BDR; -} - -element selected.urgent { - background-color: @UGT; - text-color: @FG; -} - -element selected.active { - background-color: @BGA; - color: @FG; -} diff --git a/home-manager/config/rofi/config.rasi b/home-manager/config/rofi/config.rasi deleted file mode 100644 index 3c6066a..0000000 --- a/home-manager/config/rofi/config.rasi +++ /dev/null @@ -1,111 +0,0 @@ -configuration{ - modi: "run,drun,window"; - lines: 5; - show-icons: true; - icon-theme: "Flat-Remix-Blue-Dark"; - terminal: "st"; - drun-display-format: "{name}"; - location: 0; - disable-history: false; - hide-scrollbar: true; - display-drun: " 󰵆 Apps "; - display-run: " 󰆍 Run "; - display-window: " 󱂬 Window"; - sidebar-mode: true; -} -@theme "/dev/null" -* { - background-color: #000000; - text-color: #7AA2F7; - black: #000000; - blue: #7AA2F7; - deepblue: #03339c; - clear: #00000000; - width: 800; - font: "Overpass 16"; -} -window { - height: 500px; - border: 0px; - border-radius: 15; -} - -mainbox { - children: [ mode-switcher, inputbar, listview ]; -} - -inputbar { - children: [prompt,entry]; - background-color: @black; - border-radius: 5px; - padding: 2px; -} - -prompt { - background-color: @blue; - padding: 6px; - text-color: @black; - border-radius: 5px; - margin: 20px 0px 0px 20px; -} - -textbox-prompt-colon { - expand: false; - str: ":"; -} - -entry { - padding: 6px; - margin: 20px 0px 0px 10px; -} - -listview { - border: 0px 0px 0px; - padding: 10 10 0; - margin: 10 10 0 10; - columns: 4; - spacing: 15; -} - -element { - padding: 5px; - orientation: vertical; - spacing: 10; -} - -element-icon { - size: 56px; - horizontal-align: 0.5; - background-color: @clear; -} - -element selected { - background-color: @deepblue ; - text-color: @black ; - border-radius: 8px; -} - -element-text { - vertical-align: 0.5; - horizontal-align: 0.5; - expand: true; - background-color: @clear; -} - -mode-switcher { - spacing: 0; - margin: 5 10 5 10; - padding: 10 50 5 50; -} - -button { - padding: 10px; - vertical-align: 0.5; - horizontal-align: 0.5; -} - -button selected { - background-color: @blue ; - text-color: @black; - border-radius: 10px; -} diff --git a/home-manager/config/rofi/powermenu/powermenu.rasi b/home-manager/config/rofi/powermenu/powermenu.rasi deleted file mode 100644 index 1ae793f..0000000 --- a/home-manager/config/rofi/powermenu/powermenu.rasi +++ /dev/null @@ -1,67 +0,0 @@ -configuration { - location: 0; - font: "Overpass:style=regular"; -} -* { - border: 0; - margin: 0; - padding: 0; - spacing: 0; - background: #000000; - blue: #7aa2f7; - deepblue: #03339c; - background-color: @background; - text-color: @blue; -} - - -window { - background-color: @background; - border: 2px; - border-color: @deepblue; - border-radius: 50px; - width: 490px; - height: 130px; - x-offset: -4; - y-offset: 0; -} - -listview { - background-color: @background; - columns: 1; - lines: 5; - spacing: 50px; - layout: horizontal; -} - -mainbox { - background-color: @background; - children: [ listview ]; - padding: 40px; -} - -element { - background-color: @background; - text-color: @blue; - orientation: horizontal; - /*border-radius: 100%;*/ - /*padding: 8px 32px 8px 32px;*/ -} - -element-text { - background-color: inherit; - text-color: inherit; - font: "Material Design Icons 30"; - expand: false; - horizontal-align: 0.5; - vertical-align: 0.5; - margin: 0px; -} - -element selected { - background-color: @background; - text-color: @deepblue; - border: 0px; - /*border-radius: 100%;*/ - border-color: @blue; -} diff --git a/home-manager/config/rofi/powermenu/powermenu.sh b/home-manager/config/rofi/powermenu/powermenu.sh deleted file mode 100755 index ee16386..0000000 --- a/home-manager/config/rofi/powermenu/powermenu.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -rofi_command="rofi -theme $HOME/.config/rofi/powermenu/powermenu.rasi -p "power"" - -#### Options ### -power_off="襤 " -reboot="勒 " -lock=" " -suspend=" " -log_out="﫼 " -# Variable passed to rofi -options="$power_off\n$reboot\n$suspend\n$log_out" - -chosen="$(echo -e "$options" | $rofi_command -dmenu -selected-row 2)" -case $chosen in - $power_off) - systemctl poweroff - ;; - $reboot) - systemctl reboot - ;; - $suspend) - systemctl suspend - ;; - $log_out) - bspc quit - ;; -esac diff --git a/home-manager/config/rofi/window-switcher/box.rasi b/home-manager/config/rofi/window-switcher/box.rasi deleted file mode 100644 index d122ff0..0000000 --- a/home-manager/config/rofi/window-switcher/box.rasi +++ /dev/null @@ -1,109 +0,0 @@ -configuration { - show-icons: true; - icon-theme: "Flat-Remix-Blue-Dark"; - disable-history: true; - fullscreen: false; - hide-scrollbar: true; - sidebar-mode: false; - display-window: ""; - window-format : "{t}"; - window-thumbnail: false; -} - -* { - background-color: #000000; - black: #000000; - text-color: #7AA2F7; - blue: #7AA2F7; - deepblue: #03339c; - clear: #00000000; - font: "Overpass 12"; -} - -window { - border: 0px; - border-color: @deepblue; - border-radius: 20px; - height: 150; - location: center; - x-offset: 0; - y-offset: 0; -} - -prompt { - enabled: false; - padding: 0.25% 0.75% 0% -0.25%; -} - -entry { - enabled: false; - placeholder-color: @blue; - expand: false; - horizontal-align: 0; - placeholder: "Switch to..."; - padding: 0% 0% 0% 0%; - blink: true; -} - -inputbar { - enabled: false; - children: [ prompt, entry]; - expand: false; - border: 0.3% 0% 0.3% 0%; - border-radius: 100%; - border-color: @deepblue; - margin: 0% 0% 0% 0%; -} - -listview { - margin: 0.3% 0% 0% 0%; - columns: 8; - row: 1; - spacing: 1%; - cycle: true; - dynamic: true; - layout: vertical; - fixed-height : true; -} - -mainbox { - border: 0% 0% 0% 0%; - border-radius: 0% 0% 0% 0%; - border-color: @accent; - children: [ inputbar, listview]; - spacing: -100%; - padding: 1.5% 1% 1% 1%; -} - -element { - orientation: vertical; - border-radius: 75px; - padding: 2% 0% 0% 0%; -} - -element-icon { - size: 50px; - border: 0px; -} - -element-text { - expand: false; - horizontal-align: 0.5; - vertical-align: 0.9; - margin: 1% 0.5% 0.7% 0.5%; -} - -element selected { - background-color: @deepblue; - border: 3px; - border-radius: 15px; - border-color: @deepblue; -} - -element-text, element-icon, element { - background-color: inherit; -} - -listview, element, element selected, element-icon, element-text { - cursor: pointer; -} diff --git a/home-manager/config/rofi/window-switcher/window-switcher.sh b/home-manager/config/rofi/window-switcher/window-switcher.sh deleted file mode 100755 index 5c1e2ca..0000000 --- a/home-manager/config/rofi/window-switcher/window-switcher.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -path=$HOME/.config/rofi/window-switcher/box.rasi -windows="$(xprop -root _NET_CLIENT_LIST | grep -o '0x' | wc -l )" -if (($windows<8)); then - width=$(($windows*150)) -else - width=1200 -fi -rofi \ - -no-lazy-grab \ - -show window \ - -theme $path \ - -theme-str 'window {width: '$width';}' diff --git a/home-manager/home.nix b/home-manager/home.nix index ac42a18..777d100 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -15,7 +15,6 @@ ]; xsession.numlock.enable = true; home = { - inherit username; homeDirectory = "/home/${username}"; stateVersion = "23.05"; file = { diff --git a/modules/packages.nix b/modules/packages.nix index 77be539..9650c45 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,6 +1,7 @@ { config, pkgs, + inputs, ... }: { environment.systemPackages = with pkgs; [ @@ -19,18 +20,16 @@ xfce.mousepad brightnessctl #brightness control for laptop playerctl #music control - networkmanager_dmenu #pretty gui connection control networkmanagerapplet #gui connection control - dmenu #for networkmanager_dmenu pavucontrol #gui volume control xclip #commandline clipboard access exa #ls replacement cava #pretty audio neofetch # cus yes + dmenu #suckless launcher st #suckless terminal pipes-rs # more fun things pcmanfm #file manager - haskellPackages.squeeze #file compression nix-tree #view packages bc #terminal calculator ]; diff --git a/modules/scripts.nix b/modules/scripts.nix index 5633033..9e3a070 100644 --- a/modules/scripts.nix +++ b/modules/scripts.nix @@ -16,6 +16,7 @@ echo "RUN AS ROOT" exit 1 fi + rm /nix/var/nix/gcroots/auto/* nix-collect-garbage -d ''; diff --git a/modules/xserver.nix b/modules/xserver.nix index 0460940..b14977c 100644 --- a/modules/xserver.nix +++ b/modules/xserver.nix @@ -2,6 +2,7 @@ config, pkgs, username, + inputs, ... }: { services.xserver = {