Compare commits
No commits in common. "9e53ab42c7346edd6ef06b640826c3a9eabaa456" and "c9133fc96a02ce27b02527cdec2e81445f4bf4ea" have entirely different histories.
9e53ab42c7
...
c9133fc96a
12 changed files with 30 additions and 44 deletions
32
flake.lock
generated
32
flake.lock
generated
|
@ -20,11 +20,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726665257,
|
"lastModified": 1725753098,
|
||||||
"narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=",
|
"narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e",
|
"rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -56,11 +56,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726785354,
|
"lastModified": 1726440980,
|
||||||
"narHash": "sha256-SLorVhoorZwjM1aS04bBX4fufEXIfkMdAGkj9bu2QAQ=",
|
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1786e2afdbc48e9038f7cff585069736e1d0ed44",
|
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -110,11 +110,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726761214,
|
"lastModified": 1726430622,
|
||||||
"narHash": "sha256-xaecVNHaxiAXDCUFZzDLMP3jbxpBjQTqT4Bku2z5vGA=",
|
"narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "9856378384539e35cd943604e6a4d696a9d25447",
|
"rev": "9e356562446f44c471ae38a80506a9df039305d6",
|
||||||
"revCount": 5240,
|
"revCount": 5224,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
@ -249,11 +249,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726463316,
|
"lastModified": 1726243404,
|
||||||
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
|
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
|
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -279,11 +279,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726719408,
|
"lastModified": 1726460241,
|
||||||
"narHash": "sha256-r/dXHHa6py/fKy087nGt4k3GoBjqFvpyZCsyRsXl0IA=",
|
"narHash": "sha256-wslbKgh6ZEqHzZJj1eHGRENZQ4r1C4LmAvaBKvbiGzg=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "49bb2ac8bdca209d235feabb9551dd09a5eb8ec9",
|
"rev": "fe1722602352cba0448f3961df90b5d1f55d5675",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -82,11 +82,10 @@
|
||||||
## Theming
|
## Theming
|
||||||
(nerdfonts.override {
|
(nerdfonts.override {
|
||||||
fonts = [
|
fonts = [
|
||||||
"IBMPlexMono"
|
"FantasqueSansMono"
|
||||||
"NerdFontsSymbolsOnly"
|
"NerdFontsSymbolsOnly"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
ibm-plex
|
|
||||||
libsForQt5.qtstyleplugin-kvantum
|
libsForQt5.qtstyleplugin-kvantum
|
||||||
libsForQt5.qtwayland
|
libsForQt5.qtwayland
|
||||||
qt6Packages.qtstyleplugin-kvantum
|
qt6Packages.qtstyleplugin-kvantum
|
||||||
|
|
|
@ -16,11 +16,11 @@ in
|
||||||
|
|
||||||
font = {
|
font = {
|
||||||
normal = {
|
normal = {
|
||||||
family = "BlexMono Nerd Font";
|
family = "FantasqueSansM Nerd Font";
|
||||||
style = "Regular";
|
style = "Regular";
|
||||||
};
|
};
|
||||||
|
|
||||||
size = 12;
|
size = 13;
|
||||||
};
|
};
|
||||||
|
|
||||||
window = {
|
window = {
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
|
;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
|
||||||
;; refresh your font settings. If Emacs still can't find your font, it likely
|
;; refresh your font settings. If Emacs still can't find your font, it likely
|
||||||
;; wasn't installed correctly. Font issues are rarely Doom issues!
|
;; wasn't installed correctly. Font issues are rarely Doom issues!
|
||||||
(setq doom-font (font-spec :family "BlexMono Nerd Font" :size 13))
|
(setq doom-font (font-spec :family "FantasqueSansM Nerd Font" :size 16))
|
||||||
|
|
||||||
;; There are two ways to load a theme. Both assume the theme is installed and
|
;; There are two ways to load a theme. Both assume the theme is installed and
|
||||||
;; available. You can either set `doom-theme' or manually load a theme with the
|
;; available. You can either set `doom-theme' or manually load a theme with the
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
del = "trash_file";
|
del = "trash_file";
|
||||||
dev = "nix develop -c fish";
|
dev = "nix develop -c fish";
|
||||||
doom = "~/.config/emacs/bin/doom";
|
doom = "~/.emacs.d/bin/doom";
|
||||||
};
|
};
|
||||||
|
|
||||||
functions = {
|
functions = {
|
||||||
|
|
|
@ -4,7 +4,7 @@ border-color=#282a36
|
||||||
border-radius=20
|
border-radius=20
|
||||||
border-size=2
|
border-size=2
|
||||||
default-timeout=10000
|
default-timeout=10000
|
||||||
format=<span font="IBM Plex Serif weight=325 Italic" size="12288">%s</span>\n<span font="IBM Plex Serif weight=325" size="12288">%b</span>
|
format=<span font="FantasqueSansMono NF weight=325 Italic" size="12288">%s</span>\n<span font="FantasqueSansMono NF weight=325" size="12288">%b</span>
|
||||||
group-by=summary
|
group-by=summary
|
||||||
height=125
|
height=125
|
||||||
icon-location=right
|
icon-location=right
|
||||||
|
@ -17,7 +17,7 @@ text-color=#44475a
|
||||||
width=300
|
width=300
|
||||||
|
|
||||||
[grouped]
|
[grouped]
|
||||||
format=<span font="IBM Plex Serif weight=325 Italic" size="12288">%s</span>\n<span font="IBM Plex Serif weight=325" size="12288">%b</span>
|
format=<span font="FantasqueSansMono NF weight=325 Italic" size="12288">%s</span>\n<span font="FantasqueSansMono NF weight=325" size="12288">%b</span>
|
||||||
|
|
||||||
[mode=do-not-disturb]
|
[mode=do-not-disturb]
|
||||||
invisible=1
|
invisible=1
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
grey: #737994;
|
grey: #737994;
|
||||||
|
|
||||||
width: 600;
|
width: 600;
|
||||||
font: "IBM Plex Sans 14";
|
font: "FantasqueSansM Nerd Font 14";
|
||||||
}
|
}
|
||||||
|
|
||||||
element-text, element-icon , mode-switcher {
|
element-text, element-icon , mode-switcher {
|
||||||
|
@ -87,7 +87,7 @@ button {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
background-color: @bg-col-light;
|
background-color: @bg-col-light;
|
||||||
text-color: @grey;
|
text-color: @grey;
|
||||||
vertical-align: 0.5;
|
vertical-align: 0.5;
|
||||||
horizontal-align: 0.5;
|
horizontal-align: 0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.rofi-wayland;
|
package = pkgs.rofi-wayland;
|
||||||
|
|
||||||
font = "IBM Plex Sans";
|
font = "FantasqueSansM Nerd Font";
|
||||||
|
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
disable-history = false;
|
disable-history = false;
|
||||||
|
|
|
@ -147,8 +147,8 @@
|
||||||
* {
|
* {
|
||||||
all: unset;
|
all: unset;
|
||||||
color: #c6d0f5;
|
color: #c6d0f5;
|
||||||
font-family: "IBM Plex Sans", 'Courier New', Courier, monospace;
|
font-family: "FantasqueSansM Nerd Font", 'Courier New', Courier, monospace;
|
||||||
font-size: 14px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modules-left,
|
.modules-left,
|
||||||
|
|
|
@ -9,6 +9,5 @@
|
||||||
./services.nix
|
./services.nix
|
||||||
./sound.nix
|
./sound.nix
|
||||||
./system.nix
|
./system.nix
|
||||||
./theming.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,8 +72,8 @@
|
||||||
(catppuccin-sddm.override # So SDDM finds the theme files.
|
(catppuccin-sddm.override # So SDDM finds the theme files.
|
||||||
{
|
{
|
||||||
flavor = "frappe";
|
flavor = "frappe";
|
||||||
font = "IBM Plex Sans";
|
font = "FantasqueSansM Nerd Font";
|
||||||
fontSize = "11";
|
fontSize = "12";
|
||||||
background = "${./theming/sddm/Background.jpg}";
|
background = "${./theming/sddm/Background.jpg}";
|
||||||
loginBackground = true;
|
loginBackground = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# Set the default fonts for the system.
|
|
||||||
fonts.fontconfig = {
|
|
||||||
defaultFonts = {
|
|
||||||
serif = [ "IBM Plex Serif" ];
|
|
||||||
sansSerif = [ "IBM Plex Sans" ];
|
|
||||||
monospace = [ "IBM Plex Mono" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue