Merge branch 'pc' of server:/nico/nix-files into pc
This commit is contained in:
Nico
@@ -25,8 +25,6 @@
|
||||
|
||||
programs.niri.enable = true;
|
||||
|
||||
programs.adb.enable = true;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
@@ -38,6 +36,18 @@ fileSystems."mnt/win" = {
|
||||
options = ["rw" "uid=1000"];
|
||||
};
|
||||
|
||||
# hibernation
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/var/lib/swapfile";
|
||||
size = 16 * 1024;
|
||||
}
|
||||
];
|
||||
|
||||
boot.resumeDevice = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31";
|
||||
|
||||
powerManagement.enable = true;
|
||||
|
||||
# Flakes
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
@@ -48,7 +58,7 @@ fileSystems."mnt/win" = {
|
||||
# "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Enable networking
|
||||
boot.kernelParams = [ "ipv6.disable=1" ];
|
||||
boot.kernelParams = [ "ipv6.disable=1" "resume_offset=94015488"];
|
||||
networking.networkmanager.enable = true;
|
||||
networking.hostName = "nixos"; # Define your hostname.
|
||||
networking.enableIPv6 = false;
|
||||
@@ -75,7 +85,13 @@ fileSystems."mnt/win" = {
|
||||
};
|
||||
|
||||
# Enable the X11 windowing system. You can disable this if you're only using the Wayland session.
|
||||
services.xserver.enable = true;
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
desktopManager = {
|
||||
xterm.enable = false;
|
||||
xfce.enable = false;
|
||||
};
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
@@ -88,10 +104,10 @@ fileSystems."mnt/win" = {
|
||||
default = [ "gtk" ];
|
||||
};
|
||||
niri = {
|
||||
default = [
|
||||
"gtk"
|
||||
"gnome"
|
||||
];
|
||||
# default = [
|
||||
# "gtk"
|
||||
# "gnome"
|
||||
# ];
|
||||
"org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
|
||||
"org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
|
||||
};
|
||||
@@ -101,8 +117,10 @@ fileSystems."mnt/win" = {
|
||||
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.ly.enable = false;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver = { xkb.layout = "us"; xkb.variant = "";
|
||||
};
|
||||
@@ -138,6 +156,7 @@ services.mullvad-vpn.enable = true;
|
||||
"wheel" "adbusers" "docker" "input" "dialout"]; packages = with pkgs; [
|
||||
];
|
||||
};
|
||||
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
environment.shells = with pkgs; [ zsh nushell ];
|
||||
programs.zsh.enable = true;
|
||||
@@ -166,19 +185,11 @@ programs.nix-ld.enable = true;
|
||||
vim
|
||||
wget
|
||||
git
|
||||
kitty
|
||||
tree
|
||||
nodejs
|
||||
gparted
|
||||
ntfs3g
|
||||
heroic
|
||||
wineWowPackages.stable
|
||||
winetricks
|
||||
spotify
|
||||
#spicetify-cli
|
||||
sshfs
|
||||
freetube
|
||||
# anydesk
|
||||
devenv
|
||||
|
||||
# sway
|
||||
@@ -206,8 +217,6 @@ hardware.amdgpu.opencl.enable = true;
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
programs.sway = {
|
||||
@@ -229,7 +238,7 @@ hardware.amdgpu.opencl.enable = true;
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon. services.openssh.enable = true;
|
||||
services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall. networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ]; Or disable the firewall altogether.
|
||||
|
||||
179
flake.lock
generated
179
flake.lock
generated
@@ -6,11 +6,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763165251,
|
||||
"narHash": "sha256-HqprJ5e5+tLVbk3EuWnyiBkVfKTA149eHh+u2VzUrY0=",
|
||||
"lastModified": 1764289441,
|
||||
"narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=",
|
||||
"owner": "Aylur",
|
||||
"repo": "ags",
|
||||
"rev": "0cbca42b11d23aad8c0689fc7385e517bde94c61",
|
||||
"rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -27,11 +27,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762012522,
|
||||
"narHash": "sha256-ncEN4OVFM5M9VFc4oR3gOI5K8r99GcYxtU+Cf4Z8pbs=",
|
||||
"lastModified": 1764173295,
|
||||
"narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=",
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"rev": "671d4229c798834190a50fb8b8d8addd19b529e9",
|
||||
"rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -40,13 +40,31 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"catppuccin": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767750947,
|
||||
"narHash": "sha256-zqe9esphlAFu19TGL/nAyOHyOiR+Vu8M2IWWLg9cm4U=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "e7135074fe2a3d17bee3c229b5a7d3da26f76ce8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1762538466,
|
||||
"narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=",
|
||||
"lastModified": 1765145449,
|
||||
"narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "0cea393fffb39575c46b7a0318386467272182fe",
|
||||
"rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -73,11 +91,11 @@
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"locked": {
|
||||
"lastModified": 1761588595,
|
||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||
"lastModified": 1765121682,
|
||||
"narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||
"rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -114,11 +132,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763416652,
|
||||
"narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
|
||||
"lastModified": 1767802041,
|
||||
"narHash": "sha256-ZhgbFGQGeJaZ/xkwyHlgUCeHuIdEDqugYkObPL0NCyo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
|
||||
"rev": "bdaa3743831168787f528570f2b87963e72a2f23",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -135,11 +153,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762964643,
|
||||
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
|
||||
"lastModified": 1767104570,
|
||||
"narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
|
||||
"rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -163,13 +181,34 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ndg": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nvf",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765720983,
|
||||
"narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
|
||||
"owner": "feel-co",
|
||||
"repo": "ndg",
|
||||
"rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "feel-co",
|
||||
"repo": "ndg",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1761907660,
|
||||
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
|
||||
"lastModified": 1763966396,
|
||||
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
|
||||
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -181,11 +220,27 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1763421233,
|
||||
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
|
||||
"lastModified": 1767116409,
|
||||
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cad22e7d996aea55ecab064e84834289143e44a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1767640445,
|
||||
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
|
||||
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -195,13 +250,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1761880412,
|
||||
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
|
||||
"lastModified": 1767364772,
|
||||
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
|
||||
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -211,13 +266,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"lastModified": 1767379071,
|
||||
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"rev": "fb7944c166a3b630f177938e478f0378e64ce108",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -227,26 +282,26 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 315532800,
|
||||
"narHash": "sha256-5CwQ80ucRHiqVbMEEbTFnjz70/axSJ0aliyzSaFSkmY=",
|
||||
"rev": "f6b44b2401525650256b977063dbcf830f762369",
|
||||
"lastModified": 1765772535,
|
||||
"narHash": "sha256-I715zWsdVZ+CipmLtoCAeNG0etQywiWRE5PaWntnaYk=",
|
||||
"rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre891648.f6b44b240152/nixexprs.tar.xz"
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre911985.09b8fda8959d/nixexprs.tar.xz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"lastModified": 1766902085,
|
||||
"narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -261,15 +316,16 @@
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"mnw": "mnw",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"ndg": "ndg",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762622004,
|
||||
"narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=",
|
||||
"lastModified": 1767766515,
|
||||
"narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=",
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909",
|
||||
"rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -281,8 +337,9 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"ags": "ags",
|
||||
"catppuccin": "catppuccin",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nvf": "nvf",
|
||||
"spicetify-nix": "spicetify-nix",
|
||||
"zed": "zed",
|
||||
@@ -297,11 +354,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762915112,
|
||||
"narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=",
|
||||
"lastModified": 1765465581,
|
||||
"narHash": "sha256-fCXT0aZXmTalM3NPCTedVs9xb0egBG5BOZkcrYo5PGE=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02",
|
||||
"rev": "99cc5667eece98bb35dcf35f7e511031a8b7a125",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -312,15 +369,15 @@
|
||||
},
|
||||
"spicetify-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763267524,
|
||||
"narHash": "sha256-CywB4iCpGr4CYZAD+WboFwBQ7Wnc7LdfSemFWuH/1Ro=",
|
||||
"lastModified": 1767502559,
|
||||
"narHash": "sha256-om0IPjW850vhhIrNZ5tiXjsYuqyoI44IdE+I9AwZ96I=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "cf33e39bd1a21993a28ffee8be433e212ecf346a",
|
||||
"rev": "806c1fdeb7af3e013215d14f5d9f06685fa6650f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -363,15 +420,15 @@
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763568568,
|
||||
"narHash": "sha256-PP4h13/BhOnqagvJUtILvnGIylQFm9EmIKeW6vzpWhY=",
|
||||
"lastModified": 1767801498,
|
||||
"narHash": "sha256-BKzeTqSo1hTnxmjQSiQzERg2+NOYAHCibUVsQ49Ztgg=",
|
||||
"owner": "zed-industries",
|
||||
"repo": "zed",
|
||||
"rev": "f05eef58c46be2d6617847494b444ac442780367",
|
||||
"rev": "69acab7f81950588ea0bb0ab73f4f28df1c05931",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -383,14 +440,14 @@
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763521945,
|
||||
"narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=",
|
||||
"lastModified": 1767763594,
|
||||
"narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "24d7381b9231c23daceec5d372cc28e877f7785d",
|
||||
"rev": "8b2302d8c10369c9135552cc892da75cff5ddb03",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -19,9 +19,10 @@
|
||||
|
||||
zed.url = "github:zed-industries/zed";
|
||||
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, ... }@inputs:
|
||||
outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, catppuccin, ... }@inputs:
|
||||
let system = "x86_64-linux"; in
|
||||
{
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
@@ -34,6 +35,7 @@
|
||||
# inputs.zen-browser.packages."${system}".default
|
||||
# nvf.homeManagerModules.default
|
||||
# inputs.zed.packages."${system}".default
|
||||
catppuccin.nixosModules.catppuccin
|
||||
inputs.home-manager.nixosModules.default
|
||||
];
|
||||
};
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
./packages
|
||||
inputs.spicetify-nix.homeManagerModules.default
|
||||
inputs.zen-browser.homeModules.default
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
@@ -23,7 +24,11 @@
|
||||
|
||||
programs.zen-browser.enable = true;
|
||||
|
||||
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
accent = "mauve";
|
||||
flavor = "mocha";
|
||||
};
|
||||
|
||||
home.pointerCursor =
|
||||
let
|
||||
@@ -57,7 +62,7 @@
|
||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
enable = false;
|
||||
theme = spicePkgs.themes.catppuccin;
|
||||
colorScheme = "mocha";
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
./niri
|
||||
./hyprland
|
||||
./zed-editor
|
||||
# ./tmux
|
||||
./tmux
|
||||
# ./vscode
|
||||
];
|
||||
}
|
||||
|
||||
@@ -3,8 +3,17 @@ cursor {
|
||||
xcursor-size 30
|
||||
}
|
||||
|
||||
// Mod+O Overview
|
||||
// Make workspaces four times smaller than normal in the overview.
|
||||
overview {
|
||||
zoom 0.5
|
||||
backdrop-color "#1e1e2e"
|
||||
}
|
||||
|
||||
|
||||
// Disable hotkey overlay at startup:
|
||||
hotkey-overlay {
|
||||
skip-at-startup
|
||||
}
|
||||
|
||||
// This config is in the KDL format: https://kdl.dev
|
||||
// "/-" comments out the following node.
|
||||
@@ -252,7 +261,7 @@ layout {
|
||||
struts {
|
||||
// left 64
|
||||
// right 64
|
||||
// top 64
|
||||
top -6
|
||||
// bottom 64
|
||||
}
|
||||
}
|
||||
@@ -277,7 +286,7 @@ environment {
|
||||
// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
|
||||
// This option will also fix border/focus ring drawing behind some semitransparent windows.
|
||||
// After enabling or disabling this, you need to restart the apps for this to take effect.
|
||||
// prefer-no-csd
|
||||
prefer-no-csd
|
||||
|
||||
// You can change the path where screenshots are saved.
|
||||
// A ~ at the front will be expanded to the home directory.
|
||||
@@ -295,7 +304,7 @@ animations {
|
||||
// off
|
||||
|
||||
// Slow down all animations by this factor. Values below 1 speed them up instead.
|
||||
// slowdown 3.0
|
||||
slowdown 0.8
|
||||
}
|
||||
|
||||
// Window rules let you adjust behavior for individual windows.
|
||||
@@ -374,7 +383,7 @@ binds {
|
||||
// Mod+M hotkey-overlay-title="Run an Application: rofi" { spawn "rofi" "-show" "drun"; }
|
||||
Super+Alt+L hotkey-overlay-title="Power menu" { spawn "rofi" "-show" "power-menu" "-modi" "power-menu:rofi-power-menu"; }
|
||||
Super+V hotkey-overlay-title="Clipboard history" { spawn "bash" "-c" "cliphist list | fuzzel -d | cliphist decode | wl-copy"; }
|
||||
Super+E hotkey-overlay-title="Umlaute" { spawn "bash" "-c" "echo 'ä\nö\nü\nß\nÄ\nÖ\nÜ' | fuzzel -d | wl-copy"; }
|
||||
Super+E hotkey-overlay-title="Umlaute" { spawn "bash" "-c" "echo 'aä\noö\nuü\nsß\nAÄ\nOÖ\nUÜ' | fuzzel -d | tr -d '\n aousAOU' | wl-copy"; }
|
||||
|
||||
// You can also use a shell. Do this if you need pipes, multiple commands, etc.
|
||||
// Note: the entire command goes as a single argument in the end.
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
xwayland-satellite
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
# xdg-desktop-portal-gtk
|
||||
# xdg-desktop-portal-gnome
|
||||
nautilus
|
||||
];
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ programs.neovim = {
|
||||
enable = true;
|
||||
vimAlias = true;
|
||||
};
|
||||
|
||||
catppuccin.nvim.enable = false;
|
||||
|
||||
programs.neovim.plugins = [
|
||||
pkgs.vimPlugins.lazy-nvim
|
||||
@@ -59,6 +59,10 @@ programs.neovim.plugins = [
|
||||
".config/nvim/lua/plugins/conform.lua".source = ./lua/plugins/conform.lua;
|
||||
".config/nvim/lua/plugins/nvim-tree.lua".source = ./lua/plugins/nvim-tree.lua;
|
||||
".config/nvim/lua/plugins/notify.lua".source = ./lua/plugins/notify.lua;
|
||||
# ".config/nvim/lua/plugins/rest.lua".source = ./lua/plugins/rest.lua;
|
||||
".config/nvim/lua/plugins/neominimap.lua".source = ./lua/plugins/neominimap.lua;
|
||||
".config/nvim/lua/plugins/vim-tmux-navigator.lua".source = ./lua/plugins/vim-tmux-navigator.lua;
|
||||
# ".config/nvim/lua/plugins/workspaces.lua".source = ./lua/plugins/workspaces.lua;
|
||||
|
||||
# ".config/nvim/lua/plugins/go.lua".source = ./lua/plugins/go.lua;
|
||||
# ".config/nvim/lua/plugins/typst.lua".source = ./lua/plugins/typst.lua;
|
||||
|
||||
@@ -46,8 +46,8 @@ end, { noremap = true, silent = true })
|
||||
-- Lazy
|
||||
require("config.lazy")
|
||||
|
||||
require("catppuccin").setup({})
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
-- require("catppuccin").setup({})
|
||||
-- vim.cmd.colorscheme("catppuccin")
|
||||
|
||||
-- css colors
|
||||
vim.opt.termguicolors = true
|
||||
@@ -57,7 +57,6 @@ require("nvim-highlight-colors").setup({})
|
||||
require("lualine").setup()
|
||||
require("dapui").setup()
|
||||
require("ibl").setup()
|
||||
require("telescope").load_extension("flutter")
|
||||
require("toggleterm").setup({})
|
||||
require("mini.animate").setup()
|
||||
require('nvim-autopairs').enable()
|
||||
@@ -110,17 +109,17 @@ dap.configurations.cpp = dap.configurations.gdb
|
||||
dap.configurations.rust = dap.configurations.gdb
|
||||
|
||||
--------------------------------------------
|
||||
local builtin = require("telescope.builtin")
|
||||
-- local builtin = require("telescope.builtin")
|
||||
local conform = require("conform")
|
||||
-- Love binds
|
||||
vim.keymap.set("n", "<leader>lr", ":LoveRun<CR>", { desc = "Love run" })
|
||||
-- Telescope binds
|
||||
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
|
||||
vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Telescope live grep" })
|
||||
vim.keymap.set("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "Telescope file_browser" })
|
||||
vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Telescope help tags" })
|
||||
vim.keymap.set("n", "<leader>fl", ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
|
||||
vim.keymap.set("n", "<leader>fl", ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
|
||||
-- vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
|
||||
-- vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Telescope live grep" })
|
||||
-- vim.keymap.set("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "Telescope file_browser" })
|
||||
-- vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Telescope help tags" })
|
||||
-- vim.keymap.set("n", "<leader>fl", ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
|
||||
-- vim.keymap.set("n", "<leader>fl", ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
|
||||
-- Dap binds
|
||||
vim.keymap.set("n", "<leader>do", dapui.open, { desc = "Open debug overlay" })
|
||||
vim.keymap.set("n", "<leader>dc", dapui.close, { desc = "Close debug overlay" })
|
||||
|
||||
@@ -14,5 +14,9 @@ return {
|
||||
indentscope_color = "",
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
config = function()
|
||||
require("catppuccin").setup({})
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -10,6 +10,11 @@ return {
|
||||
view = {
|
||||
width = 30,
|
||||
},
|
||||
renderer = {
|
||||
indent_markers = {
|
||||
enable = true;
|
||||
}
|
||||
}
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
10
packages/nvim/lua/plugins/rest.lua
Normal file
10
packages/nvim/lua/plugins/rest.lua
Normal file
@@ -0,0 +1,10 @@
|
||||
return {
|
||||
"rest-nvim/rest.nvim",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = function (_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
table.insert(opts.ensure_installed, "http")
|
||||
end,
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,16 @@
|
||||
return {
|
||||
"nvim-telescope/telescope-file-browser.nvim",
|
||||
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }
|
||||
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
|
||||
|
||||
config = function()
|
||||
local telescope = require("telescope")
|
||||
telescope.load_extension("flutter")
|
||||
local builtin = require("telescope.builtin")
|
||||
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
|
||||
vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Telescope live grep" })
|
||||
vim.keymap.set("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "Telescope file_browser" })
|
||||
vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Telescope help tags" })
|
||||
vim.keymap.set("n", "<leader>fl", ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
|
||||
vim.keymap.set("n", "<leader>fl", ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
|
||||
end,
|
||||
}
|
||||
|
||||
18
packages/nvim/lua/plugins/vim-tmux-navigator.lua
Normal file
18
packages/nvim/lua/plugins/vim-tmux-navigator.lua
Normal file
@@ -0,0 +1,18 @@
|
||||
return {
|
||||
"christoomey/vim-tmux-navigator",
|
||||
cmd = {
|
||||
"TmuxNavigateLeft",
|
||||
"TmuxNavigateDown",
|
||||
"TmuxNavigateUp",
|
||||
"TmuxNavigateRight",
|
||||
"TmuxNavigatePrevious",
|
||||
"TmuxNavigatorProcessList",
|
||||
},
|
||||
keys = {
|
||||
{ "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
|
||||
{ "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
|
||||
{ "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
|
||||
{ "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
|
||||
{ "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
|
||||
},
|
||||
}
|
||||
16
packages/nvim/lua/plugins/workspaces.lua
Normal file
16
packages/nvim/lua/plugins/workspaces.lua
Normal file
@@ -0,0 +1,16 @@
|
||||
return {
|
||||
"natecraddock/workspaces.nvim",
|
||||
dependencies = {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
},
|
||||
|
||||
config = function ()
|
||||
require("workspaces").setup()
|
||||
require("telescope").load_extension("workspaces");
|
||||
|
||||
vim.keymap.set("n", "<leader>w", "", { desc = "Open telescope workspaces" })
|
||||
vim.keymap.set("n", "<leader>wa", ":WorkspacesAdd ", { desc = "Add workspace" })
|
||||
vim.keymap.set("n", "<leader>wo", ":Telescope workspaces<CR>", { desc = "Show workspaces" })
|
||||
vim.keymap.set("n", "<leader>wd", ":WorkspacesRemove ", { desc = "Remove workspace" })
|
||||
end
|
||||
}
|
||||
@@ -5,6 +5,7 @@
|
||||
rofi-power-menu
|
||||
];
|
||||
|
||||
catppuccin.rofi.enable = false;
|
||||
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,7 +6,6 @@
|
||||
];
|
||||
|
||||
|
||||
|
||||
programs.nushell = {
|
||||
enable = false;
|
||||
extraConfig = ''
|
||||
@@ -44,27 +43,45 @@ programs.zsh = {
|
||||
emacs = "emacs -nw";
|
||||
femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
|
||||
pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
|
||||
dvu = "devenv up";
|
||||
dvs = "devenv shell";
|
||||
};
|
||||
|
||||
initContent = ''
|
||||
if [ "$TMUX" = "" ]; then exec tmux; fi
|
||||
|
||||
eval "$(starship init zsh)"
|
||||
|
||||
export NIX_LD=$(nix eval --impure --raw --expr 'let pkgs = import <nixpkgs> {}; NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; in NIX_LD')
|
||||
|
||||
export ZVM_VI_INSERT_ESCAPE_BINDKEY=jk
|
||||
function zvm_after_init() {
|
||||
bindkey "^[[1;5C" forward-word && bindkey "^[[1;5D" backward-word
|
||||
}
|
||||
|
||||
autoload -U select-word-style
|
||||
select-word-style bash
|
||||
'';
|
||||
|
||||
|
||||
zplug = {
|
||||
enable = false;
|
||||
plugins = [
|
||||
{ name = "zsh-users/zsh-autosuggestions"; } # Simple plugin installation
|
||||
{ name = "jeffreytse/zsh-vi-mode"; }
|
||||
];
|
||||
};
|
||||
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
# plugins = [ "thefuck" ];
|
||||
# theme = "";
|
||||
};
|
||||
plugins = [
|
||||
{
|
||||
name = "vi-mode";
|
||||
src = pkgs.zsh-vi-mode;
|
||||
file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -73,6 +90,8 @@ programs.ghostty = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
catppuccin.ghostty.enable = false;
|
||||
|
||||
home.file."/home/nico/.config/ghostty/config" = {
|
||||
source = ./ghostty-config;
|
||||
};
|
||||
|
||||
@@ -1,24 +1,30 @@
|
||||
palette = 0=#45475a
|
||||
palette = 1=#f38ba8
|
||||
palette = 2=#a6e3a1
|
||||
palette = 3=#f9e2af
|
||||
palette = 4=#89b4fa
|
||||
palette = 5=#f5c2e7
|
||||
palette = 6=#94e2d5
|
||||
palette = 7=#bac2de
|
||||
palette = 8=#585b70
|
||||
palette = 9=#f38ba8
|
||||
palette = 10=#a6e3a1
|
||||
palette = 11=#f9e2af
|
||||
palette = 12=#89b4fa
|
||||
palette = 13=#f5c2e7
|
||||
palette = 14=#94e2d5
|
||||
palette = 15=#a6adc8
|
||||
background = 1e1e2e
|
||||
foreground = cdd6f4
|
||||
cursor-color = f5e0dc
|
||||
cursor-text = 1e1e2e
|
||||
selection-background = 353749
|
||||
selection-foreground = cdd6f4
|
||||
# palette = 0=#45475a
|
||||
# palette = 1=#f38ba8
|
||||
# palette = 2=#a6e3a1
|
||||
# palette = 3=#f9e2af
|
||||
# palette = 4=#89b4fa
|
||||
# palette = 5=#f5c2e7
|
||||
# palette = 6=#94e2d5
|
||||
# palette = 7=#bac2de
|
||||
# palette = 8=#585b70
|
||||
# palette = 9=#f38ba8
|
||||
# palette = 10=#a6e3a1
|
||||
# palette = 11=#f9e2af
|
||||
# palette = 12=#89b4fa
|
||||
# palette = 13=#f5c2e7
|
||||
# palette = 14=#94e2d5
|
||||
# palette = 15=#a6adc8
|
||||
# background = 1e1e2e
|
||||
# foreground = cdd6f4
|
||||
# cursor-color = f5e0dc
|
||||
# cursor-text = 1e1e2e
|
||||
# selection-background = 353749
|
||||
# selection-foreground = cdd6f4
|
||||
|
||||
background-opacity = 0.8
|
||||
background-opacity-cells = true
|
||||
# background-blur = true
|
||||
theme = Catppuccin Mocha
|
||||
|
||||
gtk-titlebar = false
|
||||
|
||||
|
||||
@@ -1,30 +1,66 @@
|
||||
{ pkgs, config, lib,... }:
|
||||
{ pkgs, config, lib, inputs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
];
|
||||
|
||||
catppuccin.tmux = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
set -g @catppuccin_window_status_style "rounded"
|
||||
'';
|
||||
flavor = "mocha";
|
||||
};
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
terminal = "tmux-256color";
|
||||
disableConfirmationPrompt = true;
|
||||
keyMode = "vi";
|
||||
# newSession = true;
|
||||
extraConfig = ''
|
||||
# set-option -sa terminal-overrides ",xterm*:Tc"
|
||||
# set -g @catppuccin_flavor 'mocha'
|
||||
# set -g @catppuccin_window_status_style "rounded"
|
||||
# set -g default-terminal "xterm-256color"
|
||||
# set -ga terminal-overrides ",*256col*:Tc"
|
||||
# set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
|
||||
# set-environment -g COLORTERM "truecolor"
|
||||
#
|
||||
# run-shell ${pkgs.tmuxPlugins.catppuccin}/share/tmux-plugins/catppuccin/catppuccin.tmux
|
||||
|
||||
# unbind C-b
|
||||
# set -g prefix C-t
|
||||
# bind C-t send-prefix
|
||||
|
||||
# vim-like pane resizing
|
||||
bind -r C-k resize-pane -U
|
||||
bind -r C-j resize-pane -D
|
||||
bind -r C-h resize-pane -L
|
||||
bind -r C-l resize-pane -R
|
||||
|
||||
unbind k
|
||||
unbind j
|
||||
unbind h
|
||||
unbind l
|
||||
|
||||
# vim-like pane switching
|
||||
bind -r k select-pane -U
|
||||
bind -r j select-pane -D
|
||||
bind -r h select-pane -L
|
||||
bind -r l select-pane -R
|
||||
|
||||
# and now unbind keys
|
||||
unbind Up
|
||||
unbind Down
|
||||
unbind Left
|
||||
unbind Right
|
||||
|
||||
|
||||
unbind C-Up
|
||||
unbind C-Down
|
||||
unbind C-Left
|
||||
unbind C-Right
|
||||
|
||||
set -g base-index 1
|
||||
set -g pane-base-index 1
|
||||
set-window-option -g pane-base-index 1
|
||||
set-option -g renumber-windows on
|
||||
|
||||
bind '"' split-window -v -c "#{pane_current_path}"
|
||||
bind % split-window -h -c "#{pane_current_path}"
|
||||
unbind s
|
||||
bind s split-window -v -c "#{pane_current_path}"
|
||||
unbind x
|
||||
bind x split-window -h -c "#{pane_current_path}"
|
||||
|
||||
set -g mouse on
|
||||
|
||||
@@ -32,45 +68,32 @@ bind -n M-H previous-window
|
||||
bind -n M-L next-window
|
||||
|
||||
|
||||
# set vi-mode
|
||||
set-window-option -g mode-keys vi
|
||||
# keybindings
|
||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
||||
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
||||
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
|
||||
|
||||
# Smart pane switching with awareness of Vim splits.
|
||||
# See: https://github.com/christoomey/vim-tmux-navigator
|
||||
|
||||
# decide whether we're in a Vim process
|
||||
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
|
||||
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
|
||||
|
||||
bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
|
||||
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
|
||||
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
|
||||
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
|
||||
|
||||
tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
|
||||
|
||||
if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
|
||||
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
|
||||
if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
|
||||
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
|
||||
|
||||
bind-key -n 'C-Space' if-shell "$is_vim" 'send-keys C-Space' 'select-pane -t:.+'
|
||||
|
||||
bind-key -T copy-mode-vi 'C-h' select-pane -L
|
||||
bind-key -T copy-mode-vi 'C-j' select-pane -D
|
||||
bind-key -T copy-mode-vi 'C-k' select-pane -U
|
||||
bind-key -T copy-mode-vi 'C-l' select-pane -R
|
||||
bind-key -T copy-mode-vi 'C-\' select-pane -l
|
||||
bind-key -T copy-mode-vi 'C-Space' select-pane -t:.+
|
||||
'';
|
||||
|
||||
plugins = with pkgs.tmuxPlugins; [
|
||||
catppuccin {
|
||||
plugin = catppuccin;
|
||||
extraConfig = ''
|
||||
set -g @plugin 'catppuccin/tmux#2.1.3'
|
||||
set -g @catppuccin_window_status_style "rounded"
|
||||
set -g @catppuccin_flavor 'mocha'
|
||||
'';
|
||||
}
|
||||
# vim-tmux-navigator {
|
||||
# plugin = vim-tmux-navigator;
|
||||
# }
|
||||
# tmux-which-key {
|
||||
# plugin = tmux-which-key;
|
||||
# }
|
||||
# catppuccin {
|
||||
# plugin = catppuccin;
|
||||
# extraConfig = ''
|
||||
# set -g @plugin 'catppuccin/tmux#2.1.3'
|
||||
# set -g @catppuccin_window_status_style "rounded"
|
||||
# set -g @catppuccin_flavor 'mocha'
|
||||
# '';
|
||||
# }
|
||||
# pkgs.tmuxPlugins.vim-tmux-navigator
|
||||
];
|
||||
};
|
||||
|
||||
@@ -3,15 +3,38 @@
|
||||
"position": "top",
|
||||
"height": 38,
|
||||
"spacing": 0,
|
||||
"modules-left": ["clock", "niri/workspaces", "hyprland/submap"],
|
||||
"modules-left": ["clock", "niri/workspaces"],
|
||||
"modules-center": [ ],
|
||||
"modules-right": ["network", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"],
|
||||
"modules-right": [
|
||||
"network",
|
||||
"custom/separator",
|
||||
"cpu",
|
||||
"custom/separator",
|
||||
"memory",
|
||||
"custom/separator",
|
||||
"custom/notification",
|
||||
"custom/separator",
|
||||
"pulseaudio",
|
||||
"custom/separator",
|
||||
"tray"
|
||||
],
|
||||
|
||||
"tray": {
|
||||
"spacing": 10,
|
||||
"show-passive-items": true
|
||||
},
|
||||
|
||||
"custom/keyboard-layout": {
|
||||
"interval": 1,
|
||||
"exec": "hyprctl devices -j | jq -r '.keyboards[] | .active_keymap' | head -n1 | cut -c1-2 | tr 'a-z' 'A-Z'"
|
||||
},
|
||||
|
||||
"custom/separator": {
|
||||
"format": "|",
|
||||
"interval": "once",
|
||||
"tooltip": false
|
||||
},
|
||||
|
||||
"custom/notification": {
|
||||
"on-click": "swaync-client -t",
|
||||
"format": "♥"
|
||||
@@ -39,8 +62,11 @@
|
||||
},
|
||||
|
||||
"network": {
|
||||
"format-wifi": " {essid} {signalStrength}%",
|
||||
"format-disconnected": " No Connection"
|
||||
"interval": 1,
|
||||
"format": "{ifname}",
|
||||
"format-wifi": " {signalStrength}% {bandwidthDownBytes} {bandwidthUpBytes} {ipaddr} {essid}",
|
||||
"format-disconnected": "No Connection",
|
||||
"format-ethernet": " {bandwidthDownBytes} {bandwidthUpBytes} {ipaddr}"
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
|
||||
window#waybar {
|
||||
/* background: rgba(0,130,130,0); */
|
||||
background: @base;
|
||||
/* background: rgba(0,0,0,0.9); */
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
#clock,
|
||||
@@ -25,14 +26,22 @@ window#waybar {
|
||||
#custom-notification,
|
||||
#tray,
|
||||
#battery{
|
||||
background: rgba(10,10,10,100);
|
||||
opacity: 0.8;
|
||||
/* background: rgba(10,10,10,100); */
|
||||
background: @crust;
|
||||
/* opacity: 0.8; */
|
||||
/* color: #00ffff; */
|
||||
color: @mauve;
|
||||
padding: 0px 10px ;
|
||||
margin: 3px 0px;
|
||||
}
|
||||
|
||||
#custom-separator {
|
||||
background: @crust;
|
||||
color: @mauve;
|
||||
padding: 0px 2px ;
|
||||
margin: 1px 0px;
|
||||
}
|
||||
|
||||
#workspaces button{
|
||||
color: @mauve;
|
||||
border-radius: 7px;
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
home.file."/home/nico/.config/zed/settings.json" = {
|
||||
source = ./settings.json;
|
||||
};
|
||||
catppuccin.zed.enable = false;
|
||||
programs.zed-editor = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user