diff --git a/hosts/default/default.nix b/hosts/default/default.nix
index 4957956..34ba45f 100644
--- a/hosts/default/default.nix
+++ b/hosts/default/default.nix
@@ -1,8 +1,20 @@
{ config, pkgs, ... }:
{
imports = [
- ./windowManager/dwm/default.nix
- ./editors/nvim/default.nix
+ ./system/windowManager/dwm/default.nix
./system/default.nix
];
+ hardware = {
+ bluetooth = {
+ enable = true;
+ };
+ graphics = {
+ enable = true;
+ };
+ };
+ virtualisation = {
+ docker = {
+ enable = true;
+ };
+ };
}
diff --git a/hosts/default/home/home.nix b/hosts/default/home/home.nix
index 6c1f400..ac2dac0 100644
--- a/hosts/default/home/home.nix
+++ b/hosts/default/home/home.nix
@@ -5,7 +5,6 @@
}: {
imports = [
./nix
- ./../windowManager/sway/default.nix
];
home = {
enableNixpkgsReleaseCheck = false;
diff --git a/hosts/default/home/nix/default.nix b/hosts/default/home/nix/default.nix
index 349eda7..ca3bfcf 100644
--- a/hosts/default/home/nix/default.nix
+++ b/hosts/default/home/nix/default.nix
@@ -2,9 +2,7 @@
{
imports = [
./alacritty.nix
- ./shell.nix
./git.nix
./tmux.nix
- ./mpd.nix
];
}
diff --git a/hosts/default/home/nix/mpd.nix b/hosts/default/home/nix/mpd.nix
deleted file mode 100644
index edae117..0000000
--- a/hosts/default/home/nix/mpd.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ config, pkgs, ... }:
-{
- home.packages = with pkgs; [
- mpc
- mpd-discord-rpc
- mpv
- ];
- services = {
- mpd = {
- enable = true;
- musicDirectory = "/home/fabian/.music";
- extraConfig = ''
- audio_output {
- type "pipewire"
- name "Pipewire Output"
- }
- audio_output {
- type "fifo"
- name "Visualizer feed"
- path "/tmp/mpd.fifo"
- format "44100:16:2"
- }
- '';
- };
- };
-
- programs = {
- ncmpcpp = {
- enable = true;
- package = pkgs.ncmpcpp.override { visualizerSupport = true; };
- mpdMusicDir = "/home/fabian/.music";
- settings = {
- mpd_port = 6600;
- mpd_crossfade_time = 2;
- mouse_support = "yes";
- visualizer_data_source = "/tmp/mpd.fifo";
- visualizer_output_name = "my_fifo";
- visualizer_in_stereo = "no";
- visualizer_type = "spectrum";
- visualizer_look = "█┇";
- visualizer_color = "7, 5, 4, 3";
- startup_screen = "browser";
- startup_slave_screen = "visualizer";
- playlist_disable_highlight_delay = "1";
- now_playing_prefix = "$8$b ➤ ";
- song_list_format = "{$2%a$9} $1|$9 {$5%t$9} $R {$6%b$9} $1|$9 {$2%l$9}";
- song_library_format = "{%n - }{%t}|{%f}";
- song_status_format = "$b{$6%a$9 $1|$9} {$7%t$9} $1|$9 {$2%b$9} $1|$9 {$6%y$9} $1|$9";
- song_window_title_format = "{%a-%t}";
- song_columns_list_format = "(6)[magenta]{l} (30)[red]{a} (30)[blue]{b} (53)[magenta]{t}";
- playlist_display_mode = "classic";
- titles_visibility = "no";
- browser_display_mode = "columns";
- incremental_seeking = "yes";
- autocenter_mode = "yes";
- header_visibility = "no";
- statusbar_visibility = "yes";
- cyclic_scrolling = "yes";
- display_bitrate = "yes";
- ignore_leading_the = "yes";
- enable_window_title = "yes";
- progressbar_look = ":: ";
- user_interface = "alternative";
- alternative_header_first_line_format = "{$b$2%a$9} $1|$9 {$5%t$9}";
- alternative_header_second_line_format = "{$6%b$9} $1|$9 {$2(%y)$9}";
- alternative_ui_separator_color = "black";
- playlist_separate_albums = "no";
- colors_enabled = "yes";
- empty_tag_color = "blue";
- header_window_color = "black";
- volume_color = "black";
- display_volume_level = "yes";
- state_line_color = "cyan";
- state_flags_color = "red";
- main_window_color = "blue";
- color1 = "white";
- color2 = "blue";
- progressbar_color = "black";
- statusbar_color = "black";
- window_border_color = "red";
- active_window_border = "red";
- };
- };
- };
-}
diff --git a/hosts/default/home/nix/shell.nix b/hosts/default/home/nix/shell.nix
deleted file mode 100644
index a84e583..0000000
--- a/hosts/default/home/nix/shell.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ config, pkgs, ... }:
-{
- home.packages = with pkgs; [
- grc
- ];
- programs = {
- fish = {
- enable = true;
- generateCompletions = true;
- interactiveShellInit = ''
- set -gx DEVKITPRO "/opt/devkitpro";
- set -gx DEVKITPPC "/opt/devkitpro/devkitPPC";
- set -gx DEVKITA64 "/opt/devkitpro/devkitA64";
- set -gx DEVKITARM "/opt/devkitpro/devkitARM";
- set -gx PATH "/opt/devkitpro/tools/bin:$PATH";
- '';
- shellAliases = {
- g = "git";
- gc = "git commit";
- ga = "git add -A";
- http = "python3 -m http.server";
- ls = "${pkgs.eza}/bin/eza -l --icons";
- tree = "${pkgs.eza}/bin/eza --tree --icons";
- cp = "cp -rv";
- mv = "mv -v";
- mkdir = "mkdir -pv";
- update = "sudo nixos-rebuild switch --flake /etc/nixos --impure";
- };
- plugins = [
- {
- name = "fzf-fish";
- src = pkgs.fishPlugins.fzf-fish.src;
- }
- {
- name = "git-abbr";
- src = pkgs.fishPlugins.git-abbr.src;
- }
- {
- name = "forgit";
- src = pkgs.fishPlugins.forgit.src;
- }
- {
- name = "colored-man-pages";
- src = pkgs.fishPlugins.colored-man-pages.src;
- }
- ];
- };
- };
-}
diff --git a/hosts/default/system/boot.nix b/hosts/default/system/boot.nix
deleted file mode 100644
index 23f9490..0000000
--- a/hosts/default/system/boot.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-{
- boot = {
- loader = {
- systemd-boot = {
- enable = true;
- extraEntries = {
- "mint.conf" = ''
- title Linux Mint
- efi /EFI/ubuntu/shimx64.efi
- '';
- };
- };
- };
- supportedFilesystems = [ "ntfs" ];
- };
-}
diff --git a/hosts/default/system/default.nix b/hosts/default/system/default.nix
index feeea01..aa3f1ae 100644
--- a/hosts/default/system/default.nix
+++ b/hosts/default/system/default.nix
@@ -7,13 +7,8 @@
./networking.nix
./users.nix
./services.nix
- ./gaming.nix
./firefox.nix
./pkgs.nix
- ./sec.nix
- ./virt.nix
- ./boot.nix
- ./hw.nix
./radio.nix
./chromium.nix
];
diff --git a/hosts/default/editors/nvim/cmp.nix b/hosts/default/system/editors/nvim/cmp.nix
similarity index 100%
rename from hosts/default/editors/nvim/cmp.nix
rename to hosts/default/system/editors/nvim/cmp.nix
diff --git a/hosts/default/editors/nvim/default.nix b/hosts/default/system/editors/nvim/default.nix
similarity index 100%
rename from hosts/default/editors/nvim/default.nix
rename to hosts/default/system/editors/nvim/default.nix
diff --git a/hosts/default/editors/nvim/extraPlugins.nix b/hosts/default/system/editors/nvim/extraPlugins.nix
similarity index 100%
rename from hosts/default/editors/nvim/extraPlugins.nix
rename to hosts/default/system/editors/nvim/extraPlugins.nix
diff --git a/hosts/default/editors/nvim/lsp.nix b/hosts/default/system/editors/nvim/lsp.nix
similarity index 100%
rename from hosts/default/editors/nvim/lsp.nix
rename to hosts/default/system/editors/nvim/lsp.nix
diff --git a/hosts/default/editors/nvim/lualine.nix b/hosts/default/system/editors/nvim/lualine.nix
similarity index 100%
rename from hosts/default/editors/nvim/lualine.nix
rename to hosts/default/system/editors/nvim/lualine.nix
diff --git a/hosts/default/editors/nvim/neotree.nix b/hosts/default/system/editors/nvim/neotree.nix
similarity index 100%
rename from hosts/default/editors/nvim/neotree.nix
rename to hosts/default/system/editors/nvim/neotree.nix
diff --git a/hosts/default/editors/nvim/raw/cmp.lua b/hosts/default/system/editors/nvim/raw/cmp.lua
similarity index 100%
rename from hosts/default/editors/nvim/raw/cmp.lua
rename to hosts/default/system/editors/nvim/raw/cmp.lua
diff --git a/hosts/default/editors/nvim/raw/opts.lua b/hosts/default/system/editors/nvim/raw/opts.lua
similarity index 100%
rename from hosts/default/editors/nvim/raw/opts.lua
rename to hosts/default/system/editors/nvim/raw/opts.lua
diff --git a/hosts/default/editors/nvim/snip.nix b/hosts/default/system/editors/nvim/snip.nix
similarity index 100%
rename from hosts/default/editors/nvim/snip.nix
rename to hosts/default/system/editors/nvim/snip.nix
diff --git a/hosts/default/editors/nvim/terminal.nix b/hosts/default/system/editors/nvim/terminal.nix
similarity index 100%
rename from hosts/default/editors/nvim/terminal.nix
rename to hosts/default/system/editors/nvim/terminal.nix
diff --git a/hosts/default/system/gaming.nix b/hosts/default/system/gaming.nix
deleted file mode 100644
index 979af86..0000000
--- a/hosts/default/system/gaming.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- config,
- pkgs,
- ...
-}:
-{
- programs = {
- steam = {
- enable = true;
- };
- };
-}
diff --git a/hosts/default/system/hw.nix b/hosts/default/system/hw.nix
deleted file mode 100644
index a095352..0000000
--- a/hosts/default/system/hw.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, ... }:
-{
- environment.systemPackages = with pkgs; [
- hackrf
- ];
-
- hardware = {
- bluetooth = {
- enable = true;
- };
- graphics = {
- enable = true;
- };
- };
-}
diff --git a/hosts/default/system/networking.nix b/hosts/default/system/networking.nix
index e880c9b..ba4eaca 100644
--- a/hosts/default/system/networking.nix
+++ b/hosts/default/system/networking.nix
@@ -13,17 +13,6 @@
};
networking = {
networkmanager.enable = true;
- firewall = {
- enable = false;
- allowedTCPPorts = [
- 80
- 1337
- 5001
- 8080
- 3000
- 8000
- ];
- };
};
}
diff --git a/hosts/default/system/sec.nix b/hosts/default/system/sec.nix
deleted file mode 100644
index a63b7e5..0000000
--- a/hosts/default/system/sec.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, ... }:
-{
- security = {
- doas = {
- enable = true;
- extraRules = [
- {
- users = [ "fabian" ];
- noPass = true;
- keepEnv = true;
- }
- ];
- };
- };
-}
diff --git a/hosts/default/system/users.nix b/hosts/default/system/users.nix
index dfd315c..a5551cf 100644
--- a/hosts/default/system/users.nix
+++ b/hosts/default/system/users.nix
@@ -1,11 +1,47 @@
{ config, pkgs, ... }:
{
+ security = {
+ doas = {
+ enable = true;
+ extraRules = [
+ {
+ users = [ "fabian" ];
+ noPass = true;
+ keepEnv = true;
+ }
+ ];
+ };
+ };
+
+ programs = {
+ bash = {
+ enableLsColors = true;
+ completion = {
+ enable = true;
+ package = pkgs.bash-completion;
+ };
+ shellInit = ''
+ case "$TERM" in
+ xterm-color|*-256color) color_prompt=yes;;
+ esac
+
+ export DEVKITPRO="/opt/devkitpro"
+ export DEVKITA64="$DEVKITPRO/devkitA64"
+ export DEVKITARM="$DEVKITPRO/devkitARM"
+ export DEVKITPPC="$DEVKITPRO/devkitPPC"
+ '';
+
+ shellAliases = {
+ update = "sudo nixos-rebuild switch --flake /etc/nixos --impure";
+ http = "python3 -m http.server 1337";
+ };
+ };
+ };
+
users = {
- defaultUserShell = pkgs.fish;
users = {
fabian = {
useDefaultShell = true;
- shell = pkgs.fish;
isNormalUser = true;
initialPassword = "1601";
extraGroups = [
diff --git a/hosts/default/system/virt.nix b/hosts/default/system/virt.nix
deleted file mode 100644
index 550bd2a..0000000
--- a/hosts/default/system/virt.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-{
- virtualisation = {
- docker = {
- enable = true;
- };
- };
-
-}
diff --git a/hosts/default/windowManager/dwm/default.nix b/hosts/default/system/windowManager/dwm/default.nix
similarity index 100%
rename from hosts/default/windowManager/dwm/default.nix
rename to hosts/default/system/windowManager/dwm/default.nix
diff --git a/hosts/default/windowManager/dwm/source/dwm/Makefile b/hosts/default/system/windowManager/dwm/source/dwm/Makefile
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/Makefile
rename to hosts/default/system/windowManager/dwm/source/dwm/Makefile
diff --git a/hosts/default/windowManager/dwm/source/dwm/config.def.h b/hosts/default/system/windowManager/dwm/source/dwm/config.def.h
similarity index 98%
rename from hosts/default/windowManager/dwm/source/dwm/config.def.h
rename to hosts/default/system/windowManager/dwm/source/dwm/config.def.h
index 3e6f6cf..bde0d30 100644
--- a/hosts/default/windowManager/dwm/source/dwm/config.def.h
+++ b/hosts/default/system/windowManager/dwm/source/dwm/config.def.h
@@ -10,8 +10,8 @@ static int smartgaps =
0; /* 1 means no outer gap when there is only one window */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
-static const char *fonts[] = {"Fantasque Sans Mono:size=10"};
-static const char dmenufont[] = "Fantasque Sans Mono:size=10";
+static const char *fonts[] = {"Terminess Nerd Font:size=10"};
+static const char dmenufont[] = "Terminess Nerd Font:size=10";
//static const char col_gray1[] = "#262626";
//static const char col_gray2[] = "#ffffff";
diff --git a/hosts/default/windowManager/dwm/source/dwm/config.mk b/hosts/default/system/windowManager/dwm/source/dwm/config.mk
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/config.mk
rename to hosts/default/system/windowManager/dwm/source/dwm/config.mk
diff --git a/hosts/default/windowManager/dwm/source/dwm/drw.c b/hosts/default/system/windowManager/dwm/source/dwm/drw.c
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/drw.c
rename to hosts/default/system/windowManager/dwm/source/dwm/drw.c
diff --git a/hosts/default/windowManager/dwm/source/dwm/drw.h b/hosts/default/system/windowManager/dwm/source/dwm/drw.h
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/drw.h
rename to hosts/default/system/windowManager/dwm/source/dwm/drw.h
diff --git a/hosts/default/windowManager/dwm/source/dwm/dwm.1 b/hosts/default/system/windowManager/dwm/source/dwm/dwm.1
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/dwm.1
rename to hosts/default/system/windowManager/dwm/source/dwm/dwm.1
diff --git a/hosts/default/windowManager/dwm/source/dwm/dwm.c b/hosts/default/system/windowManager/dwm/source/dwm/dwm.c
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/dwm.c
rename to hosts/default/system/windowManager/dwm/source/dwm/dwm.c
diff --git a/hosts/default/windowManager/dwm/source/dwm/transient.c b/hosts/default/system/windowManager/dwm/source/dwm/transient.c
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/transient.c
rename to hosts/default/system/windowManager/dwm/source/dwm/transient.c
diff --git a/hosts/default/windowManager/dwm/source/dwm/util.c b/hosts/default/system/windowManager/dwm/source/dwm/util.c
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/util.c
rename to hosts/default/system/windowManager/dwm/source/dwm/util.c
diff --git a/hosts/default/windowManager/dwm/source/dwm/util.h b/hosts/default/system/windowManager/dwm/source/dwm/util.h
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/util.h
rename to hosts/default/system/windowManager/dwm/source/dwm/util.h
diff --git a/hosts/default/windowManager/dwm/source/dwm/vanitygaps.c b/hosts/default/system/windowManager/dwm/source/dwm/vanitygaps.c
similarity index 100%
rename from hosts/default/windowManager/dwm/source/dwm/vanitygaps.c
rename to hosts/default/system/windowManager/dwm/source/dwm/vanitygaps.c
diff --git a/hosts/default/windowManager/sway/default.nix b/hosts/default/windowManager/sway/default.nix
deleted file mode 100644
index 8667e9f..0000000
--- a/hosts/default/windowManager/sway/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-{
- imports = [
- ./sway.nix
- ];
- home = {
- packages = with pkgs; [
- waybar
- swaybg
- slurp
- grim
- ];
- file = {
- ".config/rofi/config.rasi".source = ./raw/config.rasi;
- ".config/waybar/style.css".source = ./raw/style.css;
- ".config/waybar/config".source = ./raw/config;
- };
- };
-}
diff --git a/hosts/default/windowManager/sway/raw/config b/hosts/default/windowManager/sway/raw/config
deleted file mode 100644
index 7b1b733..0000000
--- a/hosts/default/windowManager/sway/raw/config
+++ /dev/null
@@ -1,189 +0,0 @@
-[
- {
- "battery": {
- "format": "{icon} {capacity}%",
- "format-alt": "{icon} {time}",
- "format-charging": " {capacity}%",
- "format-icons": [
- "",
- "",
- "",
- "",
- ""
- ],
- "format-plugged": " {capacity}% ",
- "states": {
- "critical": 15,
- "good": 95,
- "warning": 30
- }
- },
- "cava#left": {
- "autosens": 1,
- "bar_delimiter": 0,
- "bars": 18,
- "format-icons": [
- "▁",
- "▂",
- "▃",
- "▄",
- "▅",
- "▆",
- "▇",
- "█"
- ],
- "framerate": 60,
- "higher_cutoff_freq": 10000,
- "input_delay": 2,
- "lower_cutoff_freq": 50,
- "method": "pulse",
- "monstercat": false,
- "reverse": false,
- "source": "auto",
- "stereo": true,
- "waves": false
- },
- "cava#right": {
- "autosens": 1,
- "bar_delimiter": 0,
- "bars": 18,
- "format-icons": [
- "▁",
- "▂",
- "▃",
- "▄",
- "▅",
- "▆",
- "▇",
- "█"
- ],
- "framerate": 60,
- "higher_cutoff_freq": 10000,
- "input_delay": 2,
- "lower_cutoff_freq": 50,
- "method": "pulse",
- "monstercat": false,
- "reverse": false,
- "source": "auto",
- "stereo": true,
- "waves": false
- },
- "clock": {
- "format": " {:%a, %d %b, %I:%M %p}",
- "format-alt": " {:%d/%m}",
- "tooltip": "true",
- "tooltip-format": "{:%Y %B}\n{calendar}"
- },
- "cpu": {
- "format": " {usage}%",
- "format-alt": " {avg_frequency} GHz",
- "interval": 5
- },
- "custom/launcher": {
- "format": "",
- "tooltip": "false"
- },
- "custom/playerctl#backward": {
- "format": " ",
- "on-click": "playerctl previous",
- "on-scroll-down": "playerctl volume .05-",
- "on-scroll-up": "playerctl volume .05+"
- },
- "custom/playerctl#foward": {
- "format": " ",
- "on-click": "playerctl next",
- "on-scroll-down": "playerctl volume .05-",
- "on-scroll-up": "playerctl volume .05+"
- },
- "custom/playerctl#play": {
- "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
- "format": "{icon}",
- "format-icons": {
- "Paused": " ",
- "Playing": " ",
- "Stopped": " "
- },
- "on-click": "playerctl play-pause",
- "on-scroll-down": "playerctl volume .05-",
- "on-scroll-up": "playerctl volume .05+",
- "return-type": "json"
- },
- "custom/playerlabel": {
- "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
- "format": " {} ",
- "max-length": 40,
- "on-click": "",
- "return-type": "json"
- },
- "custom/randwall": {
- "format": ""
- },
- "height": 35,
- "layer": "top",
- "margin-bottom": 0,
- "margin-left": 0,
- "margin-right": 0,
- "margin-top": 0,
- "memory": {
- "format": " {}%",
- "format-alt": " {used}/{total} GiB",
- "interval": 5
- },
- "modules-center": [
- "custom/playerlabel",
- ],
- "modules-left": [
- "cava#left",
- "custom/playerctl#backward",
- "custom/playerctl#play",
- "custom/playerctl#foward",
- ],
- "modules-right": [
- "tray",
- "battery",
- "pulseaudio",
- "network",
- ],
-
- "network": {
- "format-disconnected": " 0% ",
- "format-ethernet": " 100% ",
- "format-linked": "{ifname} (No IP)",
- "format-wifi": " {signalStrength}%",
- "tooltip-format": "Connected to {essid} {ifname} via {gwaddr}"
- },
- "position": "top",
- "pulseaudio": {
- "format": "{icon} {volume}%",
- "format-icons": {
- "default": [
- "",
- "",
- ""
- ]
- },
- "format-muted": "",
- "on-click": "pavucontrol",
- "scroll-step": 5
- },
- "tray": {
- "icon-size": 20,
- "spacing": 8
- },
- "wlr/workspaces": {
- "active-only": false,
- "all-outputs": false,
- "disable-scroll": false,
- "format": "{name}",
- "format-icons": {
- "active": "",
- "default": "",
- "sort-by-number": true,
- "urgent": ""
- },
- "on-click": "activate",
- "on-scroll-down": "hyprctl dispatch workspace e+1",
- "on-scroll-up": "hyprctl dispatch workspace e-1"
- }
- }
-]
diff --git a/hosts/default/windowManager/sway/raw/config.rasi b/hosts/default/windowManager/sway/raw/config.rasi
deleted file mode 100644
index f1ab9c7..0000000
--- a/hosts/default/windowManager/sway/raw/config.rasi
+++ /dev/null
@@ -1,76 +0,0 @@
-configuration {
- display-drun: "Applications:";
- drun-display-format: "{icon} {name}";
- font: "JetBrainsMono Nerd Font Medium 10";
- show-icons: true;
- modi: "drun";
-}
-
-@theme "/dev/null"
-
-* {
-
- opacity: 0.5;
- color0: #39305320;
- color1: #494d6420;
- color3: #d8dee9;
- color4: #7b68ee;
- color5: #cbe3e7;
-
-
- background-color: transparent;
- text-color: @color3;
- accent-color: @color5;
-
- margin: 0px;
- border: 0px;
- padding: 0px;
- spacing: 0px;
-}
-
-window {
- background-color: @color0;
- border-color: @accent-color;
-
- width: 50%;
- border: 2px;
-}
-
-inputbar {
- padding: 10px 12px;
- spacing: 12px;
- children: [ prompt, entry ];
-}
-
-prompt, entry, element-text, element-icon {
- vertical-align: 0.5;
-}
-
-prompt {
- text-color: @accent-color;
- enabled: true;
- text-color: @color4;
-}
-
-listview {
- lines: 8;
- columns: 2;
-
-}
-
-element {
- padding: 8px;
- spacing: 8px;
-}
-
-element selected {
- text-color: @color4;
-}
-
-element-icon {
- size: 20;
-}
-
-element-text {
- text-color: inherit;
-}
diff --git a/hosts/default/windowManager/sway/raw/style.css b/hosts/default/windowManager/sway/raw/style.css
deleted file mode 100644
index a1f056e..0000000
--- a/hosts/default/windowManager/sway/raw/style.css
+++ /dev/null
@@ -1,134 +0,0 @@
-* {
- border: none;
- border-radius: 0px;
- font-family: RobotoMono Nerd Font;
- font-size: 14px;
- min-height: 0;
-}
-
-window#waybar {
- /* background: rgba(17,17,27,1); */
- background: transparent;
-}
-
-#cava.left, #cava.right {
- /* background: #25253a; */
-
- /*background: #25253a;*/
- background: #010101;
- margin: 5px;
- padding: 8px 16px;
- color: #cba6f7;
-}
-#cava.left {
- border-radius: 24px 24px 24px 24px;
-}
-#cava.right {
- border-radius: 10px 24px 10px 24px;
-}
-#workspaces {
- background: #11111b;
- margin: 5px 5px;
- padding: 8px 5px;
- border-radius: 16px;
- color: #cba6f7
-}
-#workspaces button {
- padding: 0px 5px;
- margin: 0px 3px;
- border-radius: 16px;
- color: transparent;
- background: rgba(17,17,27,1);
- transition: all 0.3s ease-in-out;
-}
-
-#workspaces button.active {
- background-color: #89b4fa;
- color: #11111B;
- border-radius: 16px;
- min-width: 50px;
- background-size: 400% 400%;
- transition: all 0.3s ease-in-out;
-}
-
-#workspaces button:hover {
- background-color: #f5f5f5;
- color: #11111B;
- border-radius: 16px;
- min-width: 50px;
- background-size: 400% 400%;
-}
-
-#tray, #pulseaudio, #network, #battery,
-#custom-playerctl.backward, #custom-playerctl.play, #custom-playerctl.foward{
- background: #010101;
- font-weight: bold;
- margin: 5px 0px;
- opacity: 1;
-}
-#tray, #pulseaudio, #network, #battery{
- color: #f5f5f5;
- border-radius: 24px 24px 24px 24px;
- padding: 0 20px;
- margin-left: 7px;
-}
-#clock {
- color: #f5f5f5;
- background: #010101;
- border-radius: 0px 0px 0px 40px;
- padding: 10px 10px 15px 25px;
- margin-left: 7px;
- font-weight: bold;
- font-size: 16px;
-}
-#custom-launcher {
- color: #89b4fa;
- background: #010101;
- border-radius: 0px 0px 40px 0px;
- margin: 0px;
- padding: 0px 35px 0px 15px;
- font-size: 28px;
-}
-
-#custom-playerctl.backward, #custom-playerctl.play, #custom-playerctl.foward {
- background: #010101;
- font-size: 22px;
-}
-#custom-playerctl.backward:hover, #custom-playerctl.play:hover, #custom-playerctl.foward:hover{
- color: #f5f5f5;
-}
-#custom-playerctl.backward {
- color: #cba6f7;
- border-radius: 24px 0px 0px 24px;
- padding-left: 16px;
- margin-left: 7px;
-}
-#custom-playerctl.play {
- color: #89b4fa;
- padding: 0 5px;
-}
-#custom-playerctl.foward {
- color: #cba6f7;
- border-radius: 0px 24px 24px 0px;
- padding-right: 12px;
- margin-right: 7px
-}
-#custom-playerlabel {
- background: #010101;
- color: #f5f5f5;
- padding: 0 20px;
- border-radius: 24px 24px 24px 24px;
- margin: 5px 0;
- font-weight: bold;
-}
-#window{
- /*background: #25253a; */
- padding-left: 15px;
- padding-right: 15px;
- border-radius: 16px;
- margin-top: 5px;
- margin-bottom: 5px;
- font-weight: normal;
- font-style: normal;
- opacity: 0.1;
-}
diff --git a/hosts/default/windowManager/sway/sway.nix b/hosts/default/windowManager/sway/sway.nix
deleted file mode 100644
index 837b3e9..0000000
--- a/hosts/default/windowManager/sway/sway.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{config, pkgs, ... }:
-{
- wayland.windowManager.sway = {
- enable = true;
- xwayland = true;
- package = pkgs.swayfx-unwrapped;
- wrapperFeatures.gtk = true;
- checkConfig = false;
- extraSessionCommands = ''
- export _JAVA_AWT_WM_NONREPARENTING=1
- export QT_QPA_PLATFORM=wayland
- export XDG_CURRENT_DESKTOP=sway
- '';
-
- config = rec {
- modifier = "Mod4";
- terminal = "alacritty";
- menu = "${pkgs.rofi}/bin/rofi -show run -c .config/rofi/config.rasi";
- startup = [
- {command = "swaybg -i $HOME/.wp/soyuz.png";}
- ];
- bars = [{ command = "waybar"; }];
- gaps = {
- outer = 5;
- inner = 10;
- };
-
- window = {
- border = 0;
- };
-
- keybindings = {
- # IMPORTANT STUFF #
- "${modifier}+Return" = "exec ${terminal}";
- "${modifier}+space" = "exec ${menu}";
- "${modifier}+Q" = "kill";
- "${modifier}+Shift+R" = "reload";
- "${modifier}+Shift+S" = "${pkgs.grim}/bin/grim -g '$(${pkgs.slurp}/bin/slurp)'";
- # WINDOW STUFF #
- "${modifier}+Shift+space" = "floating toggle";
- "${modifier}+Shift+F" = "fullscreen toggle";
- "${modifier}+Left" = "focus left";
- "${modifier}+Down" = "focus down";
- "${modifier}+Up" = "focus up";
- "${modifier}+Right" = "focus right";
-
- "${modifier}+Ctrl+Right" = "resize shrink width 3 px or 3 ppt";
- "${modifier}+Ctrl+Down" = "resize grow height 3 px or 3 ppt";
- "${modifier}+Ctrl+Up" = "resize shrink height 3 px or 3 ppt";
- "${modifier}+Ctrl+Left" = "resize grow width 3 px or 3 ppt";
-
- "${modifier}+Shift+Left" = "move left";
- "${modifier}+Shift+Down" = "move down";
- "${modifier}+Shift+Up" = "move up";
- "${modifier}+Shift+Right" = "move right";
-
- # WORKSPACES #
- "${modifier}+1" = "workspace number 1";
- "${modifier}+2" = "workspace number 2";
- "${modifier}+3" = "workspace number 3";
- "${modifier}+4" = "workspace number 4";
- "${modifier}+5" = "workspace number 5";
- "${modifier}+6" = "workspace number 6";
- "${modifier}+7" = "workspace number 7";
- "${modifier}+8" = "workspace number 8";
- "${modifier}+9" = "workspace number 9";
-
- # MOVE WINDOW TO OTHER WS #
- "${modifier}+Shift+1" = "move container to workspace number 1";
- "${modifier}+Shift+2" = "move container to workspace number 2";
- "${modifier}+Shift+3" = "move container to workspace number 3";
- "${modifier}+Shift+4" = "move container to workspace number 4";
- "${modifier}+Shift+5" = "move container to workspace number 5";
- "${modifier}+Shift+6" = "move container to workspace number 6";
- "${modifier}+Shift+7" = "move container to workspace number 7";
- "${modifier}+Shift+8" = "move container to workspace number 8";
- "${modifier}+Shift+9" = "move container to workspace number 9";
-
- # Audio
- "XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +10%";
- "XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -10%";
- "XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-volume toggle-mute";
- "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
- "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
- "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
- "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
-
- "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 15%-";
- "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +15%";
- };
- };
-
- extraConfig = ''
- shadows enable
- corner_radius 12
- blur_radius 7
- blur_passes 4
- default_dim_inactive 0.2
-
- for_window [app_id="wezterm"] blur enable
- for_window [app_id="code"] blur enable
- for_window [app_id="rofi"] blur enable
-
- default_border pixel 0px
- default_floating_border none
- titlebar_border_thickness 0
- '';
- };
-}
diff --git a/hosts/meteor/configuration.nix b/hosts/meteor/configuration.nix
index b6cf64b..8bdbb41 100644
--- a/hosts/meteor/configuration.nix
+++ b/hosts/meteor/configuration.nix
@@ -55,7 +55,6 @@
programs = {
nix-ld.enable = true;
- fish.enable = true;
};
environment.etc = {
diff --git a/hosts/meteor/hardware-configuration.nix b/hosts/meteor/hardware-configuration.nix
index b677076..6acc66e 100644
--- a/hosts/meteor/hardware-configuration.nix
+++ b/hosts/meteor/hardware-configuration.nix
@@ -24,11 +24,6 @@
options = [ "fmask=0022" "dmask=0022" ];
};
- fileSystems."/media/STUFF" =
- { device = "/dev/disk/by-label/STUFF";
- fsType = "ext4";
- };
-
swapDevices = [ ];
networking.useDHCP = lib.mkDefault true;
diff --git a/hosts/sputnik/configuration.nix b/hosts/sputnik/configuration.nix
index c2edc37..c4ae3e7 100644
--- a/hosts/sputnik/configuration.nix
+++ b/hosts/sputnik/configuration.nix
@@ -11,6 +11,21 @@
./hardware-configuration.nix
../default/default.nix
];
+
+ boot = {
+ loader = {
+ systemd-boot = {
+ enable = true;
+ };
+ };
+ supportedFilesystems = [ "ntfs" ];
+ };
+
+ programs = {
+ steam = {
+ enable = true;
+ };
+ };
nixpkgs = {
config = {
@@ -49,7 +64,6 @@
programs = {
nix-ld.enable = true;
- fish.enable = true;
dconf = {
enable = true;
};
diff --git a/hosts/sputnik/hardware-configuration.nix b/hosts/sputnik/hardware-configuration.nix
index 064ae5a..e2f8200 100644
--- a/hosts/sputnik/hardware-configuration.nix
+++ b/hosts/sputnik/hardware-configuration.nix
@@ -19,7 +19,7 @@
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/9AA3-DC16";
+ { device = "/dev/disk/by-label/ESP";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};