summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/emacs/init.el6
-rw-r--r--config/spotify-player/app.toml49
-rw-r--r--config/spotify-player/default.nix11
-rw-r--r--config/spotify-player/theme.toml147
-rw-r--r--flake.lock24
-rw-r--r--machines/x/home.nix5
-rw-r--r--modules/amdgpu.nix6
-rw-r--r--modules/core/impermanence.nix2
-rw-r--r--modules/plasma.nix1
-rw-r--r--modules/virtualization.nix6
10 files changed, 230 insertions, 27 deletions
diff --git a/config/emacs/init.el b/config/emacs/init.el
index b39da3e..e4c79c0 100644
--- a/config/emacs/init.el
+++ b/config/emacs/init.el
@@ -74,7 +74,7 @@
(global-set-key (kbd "M-a") 'eshell)
(global-set-key (kbd "M-c") 'comment-line)
-(global-set-key (kbd "M-RET") 'compile)
+(global-set-key (kbd "M-RET") 'project-compile)
(defun show-flycheck-errors (buffer _action)
(let ((window (display-buffer-in-side-window
@@ -142,5 +142,5 @@
fzf/position-bottom t
fzf/window-height 15)
-(global-set-key (kbd "M-SPC") 'fzf-directory)
-(global-set-key (kbd "M-f") 'fzf-grep)
+(global-set-key (kbd "C-SPC") 'fzf-git)
+(global-set-key (kbd "M-f") 'fzf-git-grep)
diff --git a/config/spotify-player/app.toml b/config/spotify-player/app.toml
new file mode 100644
index 0000000..4365ee3
--- /dev/null
+++ b/config/spotify-player/app.toml
@@ -0,0 +1,49 @@
+theme = "Catppuccin-mocha"
+client_id = "65b708073fc0480ea92a077233ca87bd"
+client_port = 8080
+login_redirect_uri = "http://127.0.0.1:8989/login"
+playback_format = """
+{status} {track} • {artists}
+{album}
+{metadata}"""
+notify_timeout_in_secs = 0
+tracks_playback_limit = 50
+app_refresh_duration_in_ms = 32
+playback_refresh_duration_in_ms = 0
+page_size_in_rows = 20
+play_icon = "▶"
+pause_icon = "▌▌"
+liked_icon = "♥"
+border_type = "Plain"
+progress_bar_type = "Rectangle"
+cover_img_length = 9
+cover_img_width = 5
+cover_img_scale = 1.0
+enable_media_control = true
+enable_streaming = "Always"
+enable_notify = true
+enable_cover_image_cache = true
+default_device = "spotify-player"
+notify_streaming_only = false
+seek_duration_secs = 5
+
+[notify_format]
+summary = "{track} • {artists}"
+body = "{album}"
+
+[layout]
+playback_window_position = "Top"
+playback_window_height = 6
+
+[layout.library]
+playlist_percent = 40
+album_percent = 40
+
+[device]
+name = "spotify-player"
+device_type = "speaker"
+volume = 100
+bitrate = 320
+audio_cache = false
+normalization = false
+autoplay = true
diff --git a/config/spotify-player/default.nix b/config/spotify-player/default.nix
new file mode 100644
index 0000000..180baad
--- /dev/null
+++ b/config/spotify-player/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, config, ... }:
+
+{
+ home.packages = with pkgs; [
+ kdePackages.yakuake
+ spotify-player
+ ];
+
+ home.file.".config/spotify-player/theme.toml".source = ./theme.toml;
+ home.file.".config/spotify-player/app.toml".source = ./app.toml;
+}
diff --git a/config/spotify-player/theme.toml b/config/spotify-player/theme.toml
new file mode 100644
index 0000000..4360bd1
--- /dev/null
+++ b/config/spotify-player/theme.toml
@@ -0,0 +1,147 @@
+[[themes]]
+name = "Catppuccin-latte"
+[themes.palette]
+background = "#eff1f5"
+foreground = "#4c4f69"
+black = "#eff1f5"
+blue = "#1e66f5"
+cyan = "#04a5e5"
+green = "#40a02b"
+magenta = "#8839ef"
+red = "#d20f39"
+white = "#4c4f69"
+yellow = "#df8e1d"
+bright_black = "#eff1f5"
+bright_blue = "#1e66f5"
+bright_cyan = "#04a5e5"
+bright_green = "#40a02b"
+bright_magenta = "#8839ef"
+bright_red = "#d20f39"
+bright_white = "#4c4f69"
+bright_yellow = "#df8e1d"
+
+[themes.component_style]
+selection = { bg = "#ccd0da", modifiers = ["Bold"] }
+block_title = { fg = "Magenta" }
+playback_track = { fg = "Cyan", modifiers = ["Bold"] }
+playback_album = { fg = "Yellow" }
+playback_metadata = { fg = "Blue" }
+playback_progress_bar = { bg = "#ccd0da", fg = "Green" }
+current_playing = { fg = "Green", modifiers = ["Bold"] }
+page_desc = { fg = "Cyan", modifiers = ["Bold"] }
+table_header = { fg = "Blue" }
+border = {}
+playback_status = { fg = "Cyan", modifiers = ["Bold"] }
+playback_artists = { fg = "Cyan", modifiers = ["Bold"] }
+playlist_desc = { fg = "#6c6f85" }
+
+[[themes]]
+name = "Catppuccin-frappe"
+[themes.palette]
+background = "#303446"
+foreground = "#c6d0f5"
+black = "#303446"
+blue = "#8caaee"
+cyan = "#99d1db"
+green = "#a6d189"
+magenta = "#ca9ee6"
+red = "#e78284"
+white = "#c6d0f5"
+yellow = "#e5c890"
+bright_black = "#303446"
+bright_blue = "#8caaee"
+bright_cyan = "#99d1db"
+bright_green = "#a6d189"
+bright_magenta = "#ca9ee6"
+bright_red = "#e78284"
+bright_white = "#c6d0f5"
+bright_yellow = "#e5c890"
+
+[themes.component_style]
+selection = { bg = "#414559", modifiers = ["Bold"] }
+block_title = { fg = "Magenta" }
+playback_track = { fg = "Cyan", modifiers = ["Bold"] }
+playback_album = { fg = "Yellow" }
+playback_metadata = { fg = "Blue" }
+playback_progress_bar = { bg = "#414559", fg = "Green" }
+current_playing = { fg = "Green", modifiers = ["Bold"] }
+page_desc = { fg = "Cyan", modifiers = ["Bold"] }
+table_header = { fg = "Blue" }
+border = {}
+playback_status = { fg = "Cyan", modifiers = ["Bold"] }
+playback_artists = { fg = "Cyan", modifiers = ["Bold"] }
+playlist_desc = { fg = "#a5adce" }
+
+[[themes]]
+name = "Catppuccin-macchiato"
+[themes.palette]
+background = "#24273a"
+foreground = "#cad3f5"
+black = "#24273a"
+blue = "#8aadf4"
+cyan = "#91d7e3"
+green = "#a6da95"
+magenta = "#c6a0f6"
+red = "#ed8796"
+white = "#cad3f5"
+yellow = "#eed49f"
+bright_black = "#24273a"
+bright_blue = "#8aadf4"
+bright_cyan = "#91d7e3"
+bright_green = "#a6da95"
+bright_magenta = "#c6a0f6"
+bright_red = "#ed8796"
+bright_white = "#cad3f5"
+bright_yellow = "#eed49f"
+
+[themes.component_style]
+selection = { bg = "#363a4f", modifiers = ["Bold"] }
+block_title = { fg = "Magenta" }
+playback_track = { fg = "Cyan", modifiers = ["Bold"] }
+playback_album = { fg = "Yellow" }
+playback_metadata = { fg = "Blue" }
+playback_progress_bar = { bg = "#363a4f", fg = "Green" }
+current_playing = { fg = "Green", modifiers = ["Bold"] }
+page_desc = { fg = "Cyan", modifiers = ["Bold"] }
+table_header = { fg = "Blue" }
+border = {}
+playback_status = { fg = "Cyan", modifiers = ["Bold"] }
+playback_artists = { fg = "Cyan", modifiers = ["Bold"] }
+playlist_desc = { fg = "#a5adcb" }
+
+[[themes]]
+name = "Catppuccin-mocha"
+[themes.palette]
+background = "#1e1e2e"
+foreground = "#cdd6f4"
+black = "#1e1e2e"
+blue = "#89b4fa"
+cyan = "#89dceb"
+green = "#a6e3a1"
+magenta = "#cba6f7"
+red = "#f38ba8"
+white = "#cdd6f4"
+yellow = "#f9e2af"
+bright_black = "#1e1e2e"
+bright_blue = "#89b4fa"
+bright_cyan = "#89dceb"
+bright_green = "#a6e3a1"
+bright_magenta = "#cba6f7"
+bright_red = "#f38ba8"
+bright_white = "#cdd6f4"
+bright_yellow = "#f9e2af"
+
+[themes.component_style]
+selection = { bg = "#313244", modifiers = ["Bold"] }
+block_title = { fg = "Magenta" }
+playback_track = { fg = "Cyan", modifiers = ["Bold"] }
+playback_album = { fg = "Yellow" }
+playback_metadata = { fg = "Blue" }
+playback_progress_bar = { bg = "#313244", fg = "Green" }
+current_playing = { fg = "Green", modifiers = ["Bold"] }
+page_desc = { fg = "Cyan", modifiers = ["Bold"] }
+table_header = { fg = "Blue" }
+border = {}
+playback_status = { fg = "Cyan", modifiers = ["Bold"] }
+playback_artists = { fg = "Cyan", modifiers = ["Bold"] }
+playlist_desc = { fg = "#a6adc8" }
diff --git a/flake.lock b/flake.lock
index 664b3c7..ccc4a9d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,11 +45,11 @@
]
},
"locked": {
- "lastModified": 1737188535,
- "narHash": "sha256-O2ttwW1/dUc/Y+Rf48Njtr4tZpRJhy8FhafikekIjMY=",
+ "lastModified": 1737762889,
+ "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1e36429705f9af2d00a517ba46a4f21ef8a8194f",
+ "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"type": "github"
},
"original": {
@@ -60,11 +60,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1736688610,
- "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=",
+ "lastModified": 1737831083,
+ "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7",
+ "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
"type": "github"
},
"original": {
@@ -75,11 +75,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1737188028,
- "narHash": "sha256-4/7LTwK3kb/CnflThLH+PaP8Kg8CQpCvAVVacDJLBpw=",
+ "lastModified": 1737874205,
+ "narHash": "sha256-4LJOuVR82R3DMt5wbz+q+JGPQw2jdoCgKrFP8zNlDGg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0fdcadfdd348bf572a42206af9dff193d9ae515b",
+ "rev": "c1bd12cda2eabb89f36ef90da831a5743053f2c3",
"type": "github"
},
"original": {
@@ -91,11 +91,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1737062831,
- "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+ "lastModified": 1737746512,
+ "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+ "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github"
},
"original": {
diff --git a/machines/x/home.nix b/machines/x/home.nix
index 7600252..baa6937 100644
--- a/machines/x/home.nix
+++ b/machines/x/home.nix
@@ -21,7 +21,6 @@
imv
- spotify
discord
firefox
google-chrome
@@ -61,8 +60,10 @@
# "swaylock"
# "dunst"
- "alacritty"
"plasma"
+
+ "alacritty"
+ "spotify-player"
]);
home.stateVersion = "23.11";
diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix
index 430faf3..f8828f0 100644
--- a/modules/amdgpu.nix
+++ b/modules/amdgpu.nix
@@ -3,7 +3,7 @@
{
hardware.graphics.enable = true;
hardware.graphics.extraPackages = with pkgs; [
- rocmPackages.clr.icd
+ # rocmPackages.clr.icd
amdvlk
vaapiVdpau
libvdpau-va-gl
@@ -15,7 +15,7 @@
services.xserver.videoDrivers = [ "modesetting" ];
- systemd.tmpfiles.rules = [
+ /* systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
- ];
+ ]; */
}
diff --git a/modules/core/impermanence.nix b/modules/core/impermanence.nix
index e80a50e..8330235 100644
--- a/modules/core/impermanence.nix
+++ b/modules/core/impermanence.nix
@@ -29,7 +29,7 @@
"/var/lib/libvirt"
"/var/lib/systemd/coredump"
"/etc/NetworkManager/system-connections"
- # "/var/lib/docker"
+ "/var/lib/docker"
];
files = [
"/etc/machine-id"
diff --git a/modules/plasma.nix b/modules/plasma.nix
index d7910dc..f05a93f 100644
--- a/modules/plasma.nix
+++ b/modules/plasma.nix
@@ -4,7 +4,6 @@
services.desktopManager.plasma6.enable = true;
environment.plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration
- konsole
elisa
ark
gwenview
diff --git a/modules/virtualization.nix b/modules/virtualization.nix
index 34b5244..18e79ee 100644
--- a/modules/virtualization.nix
+++ b/modules/virtualization.nix
@@ -18,11 +18,7 @@ in
};
spiceUSBRedirection.enable = true;
- # docker.enable = true;
- podman = {
- enable = true;
- dockerCompat = true;
- };
+ docker.enable = true;
};
services.spice-vdagentd.enable = true;
programs.virt-manager.enable = true;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-30 18:11:57 +0000