mirror of
https://git.gay/xqtc/nixos-config
synced 2024-11-22 10:20:33 +01:00
merge
This commit is contained in:
commit
0a08839e63
|
|
@ -335,11 +335,19 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1711651867,
|
||||
"narHash": "sha256-QR1P5wE+K+P86HsTcA1vK7zPVIibrEfykETUGE8aZ9A=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7cdbfcbbd2b142800ef6ca2d53ce86b24b1c5f1f",
|
||||
=======
|
||||
"lastModified": 1711747752,
|
||||
"narHash": "sha256-iEeV/qrWaKfbdhR49B5F/sm/k0yxiGUAE5eXaoLSFNs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "387ef8710bf6ec095dea0829462f3d76a8a7f31f",
|
||||
>>>>>>> 10d7e7a560b4ae17e9c2df26080f4555c9719833
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
};
|
||||
};
|
||||
#inputs.agenix.url = "github:ryantm/agenix";
|
||||
inputs.spicetify-nix.url = "github:the-argus/spicetify-nix";
|
||||
inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
inputs.nixvim = {
|
||||
|
|
|
|||
|
|
@ -114,14 +114,14 @@ windowrulev2 = float,class:^(wezterm)$,title:^(wezterm)$
|
|||
$mainMod = SUPER
|
||||
|
||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||
bind = $mainMod SHIFT, return, exec, wezterm
|
||||
bind = $mainMod SHIFT, return, exec, wezterm-gui
|
||||
bind = $mainMod SHIFT, Q, killactive,
|
||||
bind = $mainMod SHIFT, X, exit,
|
||||
bind = $mainMod, L, exec, swaylock --indicator --clock --effect-blur 7x5 -e -f -i "~/dotfiles_new/walls/walls/1543142967600.jpg"
|
||||
|
||||
bind = $mainMod SHIFT, SPACE, togglefloating,
|
||||
bind = $mainMod, P, exec, tofi-drun --drun-launch=true
|
||||
bind = $mainMod SHIFT, P, exec, tofi-run --drun-launch=true
|
||||
bind = $mainMod, P, exec, rofi -show drun
|
||||
bind = $mainMod SHIFT, P, exec, rofi -show drun
|
||||
bind = $mainMod SHIFT, P, exec, tofi, # dwindle
|
||||
bind = $mainMod, J, togglesplit, # dwindle
|
||||
bind = $mainMod SHIFT, I, exec, grimshot copy area
|
||||
|
|
|
|||
111
home/config-files/rofi/catppuccin-mocha.rasi
Normal file
111
home/config-files/rofi/catppuccin-mocha.rasi
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
* {
|
||||
bg-col: #1e1e2e;
|
||||
bg-col-light: #1e1e2e;
|
||||
border-col: #1e1e2e;
|
||||
selected-col: #1e1e2e;
|
||||
blue: #89b4fa;
|
||||
fg-col: #cdd6f4;
|
||||
fg-col2: #f38ba8;
|
||||
grey: #6c7086;
|
||||
|
||||
width: 600;
|
||||
font: "JetBrainsMono Nerd Font 14";
|
||||
}
|
||||
|
||||
element-text, element-icon , mode-switcher {
|
||||
background-color: inherit;
|
||||
text-color: inherit;
|
||||
}
|
||||
|
||||
window {
|
||||
height: 360px;
|
||||
border: 3px;
|
||||
border-color: @border-col;
|
||||
background-color: @bg-col;
|
||||
}
|
||||
|
||||
mainbox {
|
||||
background-color: @bg-col;
|
||||
}
|
||||
|
||||
inputbar {
|
||||
children: [prompt,entry];
|
||||
background-color: @bg-col;
|
||||
border-radius: 5px;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
prompt {
|
||||
background-color: @blue;
|
||||
padding: 6px;
|
||||
text-color: @bg-col;
|
||||
border-radius: 3px;
|
||||
margin: 20px 0px 0px 20px;
|
||||
}
|
||||
|
||||
textbox-prompt-colon {
|
||||
expand: false;
|
||||
str: ":";
|
||||
}
|
||||
|
||||
entry {
|
||||
padding: 6px;
|
||||
margin: 20px 0px 0px 10px;
|
||||
text-color: @fg-col;
|
||||
background-color: @bg-col;
|
||||
}
|
||||
|
||||
listview {
|
||||
border: 0px 0px 0px;
|
||||
padding: 6px 0px 0px;
|
||||
margin: 10px 0px 0px 20px;
|
||||
columns: 2;
|
||||
lines: 5;
|
||||
background-color: @bg-col;
|
||||
}
|
||||
|
||||
element {
|
||||
padding: 5px;
|
||||
background-color: @bg-col;
|
||||
text-color: @fg-col ;
|
||||
}
|
||||
|
||||
element-icon {
|
||||
size: 25px;
|
||||
}
|
||||
|
||||
element selected {
|
||||
background-color: @selected-col ;
|
||||
text-color: @fg-col2 ;
|
||||
}
|
||||
|
||||
mode-switcher {
|
||||
spacing: 0;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 10px;
|
||||
background-color: @bg-col-light;
|
||||
text-color: @grey;
|
||||
vertical-align: 0.5;
|
||||
horizontal-align: 0.5;
|
||||
}
|
||||
|
||||
button selected {
|
||||
background-color: @bg-col;
|
||||
text-color: @blue;
|
||||
}
|
||||
|
||||
message {
|
||||
background-color: @bg-col-light;
|
||||
margin: 2px;
|
||||
padding: 2px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
textbox {
|
||||
padding: 6px;
|
||||
margin: 20px 0px 0px 20px;
|
||||
text-color: @blue;
|
||||
background-color: @bg-col-light;
|
||||
}
|
||||
18
home/config-files/rofi/config.rasi
Normal file
18
home/config-files/rofi/config.rasi
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
configuration{
|
||||
modi: "run,drun,window";
|
||||
icon-theme: "Oranchelo";
|
||||
show-icons: true;
|
||||
terminal: "wezterm";
|
||||
drun-display-format: "{icon} {name}";
|
||||
location: 0;
|
||||
disable-history: false;
|
||||
hide-scrollbar: true;
|
||||
display-drun: " Apps ";
|
||||
display-run: " Run ";
|
||||
display-window: " Window";
|
||||
display-Network: " Network";
|
||||
sidebar-mode: true;
|
||||
}
|
||||
|
||||
@theme "catppuccin-mocha"
|
||||
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
./modules/gtk.nix
|
||||
./modules/home-pkgs.nix
|
||||
./modules/git.nix
|
||||
./modules/rofi.nix
|
||||
./modules/spicetify.nix
|
||||
#./modules/ssh.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -71,6 +71,8 @@ in {
|
|||
pkgs.jellyfin-media-player
|
||||
#pkgs.feishin
|
||||
|
||||
pkgs.nix-tree
|
||||
|
||||
pkgs.nixos-icons
|
||||
pkgs.swww
|
||||
]
|
||||
|
|
|
|||
103
home/modules/rofi.nix
Normal file
103
home/modules/rofi.nix
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
terminal = "wezterm";
|
||||
disable-history = false;
|
||||
show-icons = true;
|
||||
sidebar-mode = true;
|
||||
sort = true;
|
||||
drun-display-format = "{icon} {name}";
|
||||
display-drun = " Run ";
|
||||
modi = lib.strings.concatStringsSep "," [
|
||||
"run"
|
||||
"drun"
|
||||
"filebrowser"
|
||||
];
|
||||
font = "Hack Nerd Font Mono 13";
|
||||
};
|
||||
theme = let mkLiteral = config.lib.formats.rasi.mkLiteral;
|
||||
in {
|
||||
"*" = {
|
||||
bg = mkLiteral "#303446FF";
|
||||
fg = mkLiteral "#D9E0EEFF";
|
||||
ac = mkLiteral "#8CAAEEFF";
|
||||
};
|
||||
|
||||
"#window" = {
|
||||
location = mkLiteral "center";
|
||||
width = mkLiteral "50%";
|
||||
};
|
||||
|
||||
"#prompt" = {
|
||||
background-color = mkLiteral "@bg";
|
||||
text-color = mkLiteral "@fg";
|
||||
};
|
||||
|
||||
"#textbox-prompt-colon" = {
|
||||
text-color = mkLiteral "@fg";
|
||||
};
|
||||
|
||||
"#entry" = {
|
||||
background-color = mkLiteral "@bg";
|
||||
text-color = mkLiteral "@fg";
|
||||
blink = mkLiteral "true";
|
||||
};
|
||||
|
||||
"#inputbar" = {
|
||||
children = mkLiteral "[ prompt, entry ]";
|
||||
background-color = mkLiteral "@bg";
|
||||
text-color = mkLiteral "@fg";
|
||||
padding = mkLiteral "5px";
|
||||
};
|
||||
|
||||
"#listview" = {
|
||||
background-color = mkLiteral "@bg";
|
||||
columns = mkLiteral "1";
|
||||
lines = mkLiteral "5";
|
||||
cycle = mkLiteral "false";
|
||||
dynamic = mkLiteral "true";
|
||||
};
|
||||
|
||||
"#mainbox" = {
|
||||
background-color = mkLiteral "@bg";
|
||||
border = mkLiteral "3px";
|
||||
border-color = mkLiteral "@ac";
|
||||
children = mkLiteral "[ inputbar, listview ]";
|
||||
padding = mkLiteral "10px";
|
||||
};
|
||||
|
||||
"#element" = {
|
||||
background-color = mkLiteral "@bg";
|
||||
text-color = mkLiteral "@fg";
|
||||
padding = mkLiteral "5px";
|
||||
};
|
||||
|
||||
"#element-icon" = {
|
||||
background-color = mkLiteral "@bg";
|
||||
text-color = mkLiteral "@fg";
|
||||
size = mkLiteral "32px";
|
||||
};
|
||||
|
||||
"#element-text" = {
|
||||
background-color = mkLiteral "@bg";
|
||||
text-color = mkLiteral "@fg";
|
||||
padding = mkLiteral "5px";
|
||||
};
|
||||
|
||||
"#element selected" = {
|
||||
border = mkLiteral "3px";
|
||||
border-color = mkLiteral "@ac";
|
||||
};
|
||||
};
|
||||
};
|
||||
#home.file.".config/rofi/config.rasi".text = builtins.readFile ../config-files/rofi/config.rasi;
|
||||
#home.file.".local/share/rofi/themes/catppuccin-mocha.rasi".text = builtins.readFile ../config-files/rofi/catppuccin-mocha.rasi;
|
||||
}
|
||||
|
||||
|
|
@ -75,10 +75,9 @@
|
|||
# };
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
# services.xserver.enable = true;
|
||||
# services.xserver.displayManager.gdm.enable = true;
|
||||
#services.xserver.displayManager.ly.enable = true;
|
||||
# services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.enable = true;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
#services.xserver.displayManager.defaultSession = "plasmawayland";
|
||||
# services.xserver.videoDrivers = ["intel"];
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue