Compare commits
4 commits
048208711a
...
3a43fc1002
Author | SHA1 | Date | |
---|---|---|---|
3a43fc1002 | |||
2e3be3f00d | |||
9da1420195 | |||
f06c129d6d |
5 changed files with 215 additions and 51 deletions
|
@ -54,6 +54,45 @@
|
|||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = false;
|
||||
services.xserver.desktopManager.plasma5.enable = false;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
environment.gnome.excludePackages = (with pkgs; [
|
||||
gnome-weather
|
||||
gnome-user-docs
|
||||
gnome-text-editor
|
||||
gnome-disk-utility
|
||||
gnome-maps
|
||||
gnome-calculator
|
||||
gnome-calendar
|
||||
gnome-connections
|
||||
gnome-font-viewer
|
||||
gnome-console
|
||||
snapshot
|
||||
file-roller
|
||||
gnome-logs
|
||||
gnome-clocks
|
||||
gnome-contacts
|
||||
evince
|
||||
orca
|
||||
rygel
|
||||
yelp
|
||||
simple-scan
|
||||
baobab
|
||||
atomix # puzzle game
|
||||
cheese # webcam tool
|
||||
epiphany # web browser
|
||||
evince # document viewer
|
||||
geary # email reader
|
||||
gedit # text editor
|
||||
gnome-characters
|
||||
gnome-music
|
||||
gnome-photos
|
||||
gnome-terminal
|
||||
gnome-tour
|
||||
hitori # sudoku game
|
||||
iagno # go game
|
||||
tali # poker game
|
||||
totem # video player
|
||||
]);
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
@ -92,7 +131,7 @@
|
|||
|
||||
# Enable sound with pipewire.
|
||||
#sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pulseaudio.enable = false;
|
||||
#hardware.pulseaudio.support32Bit = true;
|
||||
#hardware.pulseaudio.extraConfig = "load-module module-combine-sink";
|
||||
security.rtkit.enable = true;
|
||||
|
@ -126,7 +165,7 @@
|
|||
users.users.insert = {
|
||||
isNormalUser = true;
|
||||
description = "insert";
|
||||
extraGroups = [ "networkmanager" "wheel" "input" "docker" "audio" "libvirtd" ];
|
||||
extraGroups = [ "networkmanager" "wheel" "input" "docker" "audio" "libvirtd" "adbusers"];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
|
@ -190,6 +229,8 @@
|
|||
pkgs.wayland
|
||||
pkgs.docker-compose
|
||||
pkgs.networkmanagerapplet
|
||||
pkgs.SDL2
|
||||
pkgs.glfw
|
||||
#pkgs.sway
|
||||
inputs.agenix.packages."${pkgs.system}".default
|
||||
pkgs.vlc
|
||||
|
@ -218,6 +259,7 @@
|
|||
services.tailscale.enable = true;
|
||||
services.gvfs.enable = true;
|
||||
programs.steam.enable = true;
|
||||
programs.adb.enable = true;
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
|
@ -240,8 +282,7 @@
|
|||
freeMemThreshold = 8;
|
||||
enableNotifications = true;
|
||||
extraArgs = [
|
||||
"-g" "--avoid '^(X|hypr.*|kitty|wayland)$'"
|
||||
"--prefer '^(electron|librewolf|firefox|java|minecraft.*)$'"
|
||||
"-g"
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -314,10 +355,6 @@
|
|||
#xdg.portal = { enable = true; extraPortals = [ inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; };
|
||||
#xdg.portal = { enable = true; };
|
||||
|
||||
nix.settings = {
|
||||
substituters = ["https://hyprland.cachix.org"];
|
||||
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
|
||||
};
|
||||
|
||||
services.nscd.config = ''
|
||||
server-user nscd
|
||||
|
|
88
flake.lock
88
flake.lock
|
@ -47,17 +47,18 @@
|
|||
},
|
||||
"flatpaks": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728804768,
|
||||
"narHash": "sha256-WG8KWmT72SA1XrmixxJwI1RRWrT9D97kkYSE5OfOJdg=",
|
||||
"lastModified": 1736345250,
|
||||
"narHash": "sha256-zHhs9LCNLRKkxcdPjovLPHi+zy/sxZylmpLybTMJNRE=",
|
||||
"owner": "GermanBread",
|
||||
"repo": "declarative-flatpak",
|
||||
"rev": "42cc2c4d97a03889d551cc82c43a0b124fd403f6",
|
||||
"rev": "0935eabbc8fe347ce31af4e41196593d42848c08",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -89,17 +90,36 @@
|
|||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733572789,
|
||||
"narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729027341,
|
||||
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
|
||||
"lastModified": 1736421950,
|
||||
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
|
||||
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -110,11 +130,27 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728888510,
|
||||
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
|
||||
"lastModified": 1731755305,
|
||||
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
|
||||
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1736344531,
|
||||
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -128,8 +164,8 @@
|
|||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"flatpaks": "flatpaks",
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"home-manager": "home-manager_3",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
@ -149,34 +185,16 @@
|
|||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
nixosConfigurations.insertpclinux = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
flatpaks.nixosModules.default
|
||||
flatpaks.nixosModules.declarative-flatpak
|
||||
./configuration.nix
|
||||
./special/insertpclinux.nix
|
||||
agenix.nixosModules.default
|
||||
|
@ -32,7 +32,7 @@
|
|||
nixosConfigurations.insertpcname = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
flatpaks.nixosModules.default
|
||||
flatpaks.nixosModules.declarative-flatpak
|
||||
./configuration.nix
|
||||
./special/insertpcname.nix
|
||||
agenix.nixosModules.default
|
||||
|
@ -48,7 +48,7 @@
|
|||
nixosConfigurations.insertlaptop = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
flatpaks.nixosModules.default
|
||||
flatpaks.nixosModules.declarative-flatpak
|
||||
./configuration.nix
|
||||
./special/insertlaptop.nix
|
||||
agenix.nixosModules.default
|
||||
|
|
108
home.nix
108
home.nix
|
@ -12,7 +12,7 @@
|
|||
#pkgs.cinny-desktop
|
||||
pkgs.firefox
|
||||
pkgs.kate
|
||||
#pkgs.cliphist TODO: reenable once fixed upstream
|
||||
pkgs.cliphist
|
||||
pkgs.flameshot
|
||||
pkgs.godot_4
|
||||
pkgs.filezilla
|
||||
|
@ -32,6 +32,11 @@
|
|||
#pkgs.atool
|
||||
#pkgs.httpie
|
||||
pkgs.webcord
|
||||
pkgs.gnomeExtensions.paperwm
|
||||
pkgs.gnomeExtensions.forge
|
||||
pkgs.gnomeExtensions.appindicator
|
||||
pkgs.gnomeExtensions.unite
|
||||
pkgs.gnomeExtensions.pop-shell
|
||||
pkgs.tigervnc
|
||||
pkgs.syncthing
|
||||
pkgs.zsh-syntax-highlighting
|
||||
|
@ -76,9 +81,9 @@
|
|||
size = 24;
|
||||
};
|
||||
theme = {
|
||||
name = "catppuccin-frappe-mauve-standard";
|
||||
name = "catppuccin-frappe-sapphire-standard";
|
||||
package = pkgs.catppuccin-gtk.override {
|
||||
accents = [ "mauve" ];
|
||||
accents = [ "sapphire" ];
|
||||
size = "standard";
|
||||
#tweaks = [ "black" ];
|
||||
variant = "frappe";
|
||||
|
@ -109,8 +114,101 @@
|
|||
};
|
||||
};
|
||||
|
||||
programs.nnn = {
|
||||
dconf = {
|
||||
enable = true;
|
||||
settings."org/gnome/desktop/wm/preferences" = {
|
||||
num-workspaces = 10;
|
||||
button-layout = "";
|
||||
focus-mode = "sloppy";
|
||||
};
|
||||
settings."org/gnome/shell/extensions/user-theme".name = "catppuccin-frappe-sapphire-standard";
|
||||
settings."org/gnome/desktop/wm/keybindings" = {
|
||||
switch-to-workspace-left = ["<Alt>Left"];
|
||||
switch-to-workspace-right = ["<Alt>Right"];
|
||||
switch-to-workspace-1="['<Alt>1']";
|
||||
switch-to-application-1="@as []";
|
||||
move-to-workspace-1="['<Alt><Shift>1']";
|
||||
switch-to-workspace-2="['<Alt>2']";
|
||||
switch-to-application-2="@as []";
|
||||
move-to-workspace-2="['<Alt><Shift>2']";
|
||||
switch-to-workspace-3="['<Alt>3']";
|
||||
switch-to-application-3="@as []";
|
||||
move-to-workspace-3="['<Alt><Shift>3']";
|
||||
switch-to-workspace-4="['<Alt>4']";
|
||||
switch-to-application-4="@as []";
|
||||
move-to-workspace-4="['<Alt><Shift>4']";
|
||||
switch-to-workspace-5="['<Alt>5']";
|
||||
switch-to-application-5="@as []";
|
||||
move-to-workspace-5="['<Alt><Shift>5']";
|
||||
switch-to-workspace-6="['<Alt>6']";
|
||||
switch-to-application-6="@as []";
|
||||
move-to-workspace-6="['<Alt><Shift>6']";
|
||||
switch-to-workspace-7="['<Alt>7']";
|
||||
switch-to-application-7="@as []";
|
||||
move-to-workspace-7="['<Alt><Shift>7']";
|
||||
switch-to-workspace-8="['<Alt>8']";
|
||||
switch-to-application-8="@as []";
|
||||
move-to-workspace-8="['<Alt><Shift>8']";
|
||||
switch-to-workspace-9="['<Alt>9']";
|
||||
switch-to-application-9="@as []";
|
||||
move-to-workspace-9="['<Alt><Shift>9']";
|
||||
switch-to-workspace-10="['<Alt>0']";
|
||||
switch-to-application-10="@as []";
|
||||
move-to-workspace-10="['<Alt><Shift>0']";
|
||||
close = ["<Alt>c"];
|
||||
toggle-fullscreen = ["<Alt>f"];
|
||||
};
|
||||
settings."org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
|
||||
name = "kitty";
|
||||
command = "kitty";
|
||||
binding = "<Alt>Return";
|
||||
};
|
||||
settings."org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
|
||||
name = "cliphist";
|
||||
binding = "<Alt>o";
|
||||
command = "cliphist list | wofi -S dmenu | cliphist decode | wl-copy";
|
||||
};
|
||||
settings."org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2" = {
|
||||
name = "wofi";
|
||||
binding = "<Alt>r";
|
||||
command = "wofi --show drun --allow-images";
|
||||
};
|
||||
settings."org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
enable-hot-corners = false;
|
||||
|
||||
};
|
||||
settings."org/gnome/shell/extensions/forge" = {
|
||||
auto-split-enabled = false;
|
||||
};
|
||||
settings."org/gnome/shell/extensions/pop-shell" = {
|
||||
tile-by-default = true;
|
||||
active-hint = true;
|
||||
hint-color-rgba = "rgba(133,193,220,1)";
|
||||
};
|
||||
settings."org/gnome/shell/extensions/unite" = {
|
||||
hide-window-titlebars = "always";
|
||||
show-window-title = "always";
|
||||
hide-activities-button = "never";
|
||||
use-activities-text = false;
|
||||
restrict-to-primary-screen = "false";
|
||||
};
|
||||
settings."org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions = with pkgs.gnomeExtensions; [
|
||||
user-themes.extensionUuid
|
||||
#forge.extensionUuid
|
||||
applications-menu.extensionUuid
|
||||
unite.extensionUuid
|
||||
appindicator.extensionUuid
|
||||
pop-shell.extensionUuid
|
||||
"system-monitor@gnome-shell-extensions.gcampax.github.com"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
programs.nnn = {
|
||||
enable = false;
|
||||
#plugins = { "launch", "imgview" };
|
||||
plugins.src = (pkgs.fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
|
@ -230,7 +328,7 @@
|
|||
};
|
||||
|
||||
services.cliphist = {
|
||||
enable = false; #TODO: change once fixed
|
||||
enable = true;
|
||||
allowImages = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -118,6 +118,17 @@
|
|||
# WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card2";
|
||||
#};
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.wivrn
|
||||
];
|
||||
|
||||
services.wivrn = {
|
||||
enable = true;
|
||||
autoStart = false;
|
||||
defaultRuntime = true;
|
||||
extraPackages = [pkgs.monado-vulkan-layers];
|
||||
};
|
||||
|
||||
home-manager.users.insert.home.file.".config/hypr/hyprland.conf" = {
|
||||
text = ''autogenerated = 0 # remove this line to remove the warning
|
||||
|
||||
|
|
Loading…
Reference in a new issue