schrottkatze/nix-configs
1
0
Fork 0
mirror of https://forge.katzen.cafe/schrottkatze/nix-configs.git synced 2024-11-05 15:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: schrottkatze:ee44af814e6eafc5006e7c34ade4fe5253b25581
Branches Tags
schrottkatze:main
schrottkatze:push-ryvwvsovxzpu
schrottkatze:push-pqvqptxrrmyk
...
compare: schrottkatze:e222066a878aadbdc300e1ca6b1808ecb68cd660
Branches Tags
schrottkatze:main
schrottkatze:push-ryvwvsovxzpu
schrottkatze:push-pqvqptxrrmyk

8 commits
ee44af814e ... e222066a87

Author SHA1 Message Date
Jade e222066a87
do program stuffs 2024-07-28 21:11:44 +02:00
Jade 7995708a59
update desktop 2024-07-28 20:55:32 +02:00
Schrottkatze 020a9276d5
sway things (more or less successful) 2024-07-28 20:54:07 +02:00
Schrottkatze f22a20b08c
add some programs and set up nix auto gc 2024-07-28 20:54:07 +02:00
Schrottkatze c64f321cc5
setup nushell plugins 2024-07-28 20:54:07 +02:00
Schrottkatze ee901946e2
more bar 2024-07-28 20:54:07 +02:00
Jade 737bdba912
Merge branch 'main' of ssh://forge.katzen.cafe:2222/schrottkatze/nix-configs 2024-07-28 20:45:43 +02:00
Jade d628301131
flake.lock: Update 
Flake lock file updates:

• Updated input 'crane':
    'github:ipetkov/crane/45ea0059fb325132fdc3c39faffb0941d25d08d3' (2024-04-18)
  → 'github:ipetkov/crane/a5eca68a2cf11adb32787fc141cddd29ac8eb79c' (2024-04-24)
• Updated input 'fenix':
    'github:nix-community/fenix/3247290e1bba55878a2c62d43894d0309d29c918' (2024-04-20)
  → 'github:nix-community/fenix/94be183087845937b0fd77281c37d0796572b899' (2024-04-28)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/c83d8cf5844fff3d6e243ab408669222059af1c6' (2024-04-19)
  → 'github:rust-lang/rust-analyzer/f216be4a0746142c5f30835b254871256a7637b8' (2024-04-27)
• Updated input 'home-manager':
    'github:nix-community/home-manager/057117a401a34259c9615ce62218aea7afdee4d3' (2024-04-19)
  → 'github:nix-community/home-manager/c1609d584a6b5e9e6a02010f51bd368cb4782f8e' (2024-04-27)
• Updated input 'mac-brcm-fw':
    'path:/home/jade/nix-configs/mac-brcm-fw?lastModified=1709065070&narHash=sha256-%2BkW8ogc6DykjMVlrr%2B3vWKs9ZUdJ9EW72LbY7k/Qvh4%3D' (2024-02-27)
  → 'path:/home/jade/nix-configs/mac-brcm-fw?lastModified=1701030348&narHash=sha256-%2BkW8ogc6DykjMVlrr%2B3vWKs9ZUdJ9EW72LbY7k/Qvh4%3D' (2023-11-26)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19)
  → 'github:NixOS/nixpkgs/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856' (2024-04-25)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd' (2024-04-17)
  → 'github:NixOS/nixpkgs/12430e43bd9b81a6b4e79e64f87c624ade701eaf' (2024-04-28)
• Updated input 'nixpkgs-unstable-small':
    'github:NixOS/nixpkgs/c0f9060ec3937d5a7cf3ce6c698e14d989b453e5' (2024-04-20)
  → 'github:NixOS/nixpkgs/30ddacc06345a478f9528fa29e2c8857b90381b2' (2024-04-28)
 2024-04-28 16:01:22 +02:00
7 changed files with 170 additions and 45 deletions
Show stats Expand all files Collapse all files

8
common.nix
View file

@ -45,6 +45,8 @@ with builtins; {
htmlq
prusa-slicer
zed-editor
wget
git
neofetch
@ -158,4 +160,10 @@ with builtins; {
};
users.defaultUserShell = pkgs.nushell;
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 60d";
};
}

58
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1718078026,
"narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=",
"lastModified": 1721842668,
"narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
"owner": "ipetkov",
"repo": "crane",
"rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892",
"rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
"type": "github"
},
"original": {
@ -28,11 +28,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1717827974,
"narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=",
"lastModified": 1722148092,
"narHash": "sha256-5QS64rfIFDzU1jmZrOK6wyZOCi6Vn/90apWRI6Hy+xk=",
"owner": "nix-community",
"repo": "fenix",
"rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8",
"rev": "b39d8959f286dc7b9da91ae92f6af56de0169e87",
"type": "github"
},
"original": {
@ -104,11 +104,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1717871542,
"narHash": "sha256-eUB9gt3Hva7atNOv/Vel1bchD/9Pziz0C/r9K0vh+qQ=",
"lastModified": 1721054193,
"narHash": "sha256-xonM9t7oZ8YiwcEXuVlhs+8FsMSXI42djzUgpDt1n/w=",
"owner": "pascalkuthe",
"repo": "helix",
"rev": "418ac237bf1e162b866a873d6cd33bb69f5d1bb4",
"rev": "386fa371d708f8e91a83762dfc7a58971681e091",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
]
},
"locked": {
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"lastModified": 1722119539,
"narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
"type": "github"
},
"original": {
@ -167,11 +167,11 @@
]
},
"locked": {
"lastModified": 1717647344,
"narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=",
"lastModified": 1720695775,
"narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=",
"ref": "refs/heads/main",
"rev": "4e25f1ab68f2270f9cff59216056c21073db0164",
"revCount": 87,
"rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a",
"revCount": 94,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@ -183,7 +183,7 @@
"mac-brcm-fw": {
"flake": false,
"locked": {
"lastModified": 1709065070,
"lastModified": 1701030348,
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
"path": "/home/jade/nix-configs/mac-brcm-fw",
"type": "path"
@ -211,11 +211,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717974879,
"narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
"lastModified": 1722062969,
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
"type": "github"
},
"original": {
@ -226,11 +226,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1718060059,
"narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=",
"lastModified": 1720535198,
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3c8d64ba846725f040582b2d3b875466d2115bd",
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
"type": "github"
},
"original": {
@ -241,11 +241,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1718083092,
"narHash": "sha256-EQsPXycAbmby4meQUNLYfFaGOiqz2J9AlwFRV4UiHnY=",
"lastModified": 1722179153,
"narHash": "sha256-ZJ75T0GWpLI4hoaL+YxueHD2pXG+VYpYtPJdwbkERVs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aa1ebdaf49a606e21c06e0f6ed7aece9a41831c3",
"rev": "dcfb2878c687e5eb5fcbc5116969c45c85be34e2",
"type": "github"
},
"original": {
@ -272,11 +272,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1717583671,
"narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=",
"lastModified": 1722099723,
"narHash": "sha256-61f+rvQAObm/TuBEqYFNUTngm/wXcuNhGtQbAmfZVvY=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "48bbdd6a74f3176987d5c809894ac33957000d19",
"rev": "a46788318cce3b62e14606f70a14896b223ee5ec",
"type": "github"
},
"original": {

9
hosts/monosodium-glutamate-g/configuration.nix
View file

@ -9,18 +9,14 @@
];
jade = {
flatpak.enable = true;
desktop = {
compositing.enable = true;
syncthing.enable = true;
kdeconnect.enable = true;
cloud.enable = true;
social.enable = true;
gaming.enable = true;
mail.enable = true;
evremap.enable = false;
};
terminal.enable = true;
};
boot = {
loader = {
@ -59,11 +55,6 @@
# missing: menu-qalc picom-jonaburg
environment.systemPackages = with pkgs; [
# TODO: clean up.
libGL
libreoffice-fresh
wireshark
awesomebump
zenstates
zenmonitor
nvtop-amd

3
modules/desktop-environment/default.nix
View file

@ -4,4 +4,7 @@
./flatpak.nix
./home
];
services.upower = {
enable = true;
};
}

127
modules/desktop-environment/home/sway/default.nix
View file

@ -7,6 +7,126 @@
programs.wofi.enable = true;
programs.swaylock.enable = true;
xdg.portal = {
enable = true;
extraPortals = [pkgs.xdg-desktop-portal-wlr];
# sway = {
# default = ["wlr"];
# };
};
services.swayidle = {
enable = true;
events = [
{
event = "lock";
command = "swaylock -c 441144";
}
];
};
programs.waybar = {
enable = true;
systemd = {
enable = true;
target = "sway-session.target";
};
settings = {
infobar = {
layer = "top";
position = "top";
modules-left = ["memory" "cpu" "network" "group/bats"];
modules-center = ["sway/window"];
modules-right = ["clock"];
"group/bats" = {
orientation = "inherit";
modules = ["battery#bat0" "battery#bat1" "upower#headphones"];
};
"battery#bat0" = {
adapter = "AC";
bat = "BAT0";
interval = 2;
format = "{icon} {capacity}% {time}";
format-charging = "󱐋 {icon} {capacity}% {time}";
format-time = "{h}:{m}";
format-icons = [
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
tooltip = true;
tooltip-format = "BAT0: {cycles} cycles";
};
"battery#bat1" = {
adapter = "AC";
bat = "BAT1";
interval = 2;
format = "󱐋 {icon} {capacity}% {time}";
format-time = "{H}:{M}";
format-icons = [
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
tooltip = true;
tooltip-format = "BAT1: {cycles} cycles";
};
"upower#headphones" = {
native-path = "/org/bluez/hci0/dev_4C_87_5D_29_B3_76";
format = "󰋋 {percentage} {time}";
hide-if-empty = true;
show-icon = false;
};
};
interactiveBar = {
layer = "top";
position = "bottom";
modules-left = ["sway/workspaces" "sway/mode"];
modules-center = ["tray"];
modules-right = ["wlr/taskbar"];
};
# mainBar = {
# layer = "top";
# position = "top";
# height = 30;
# output = [
# "eDP-1"
# "HDMI-A-1"
# ];
# modules-left = ["sway/workspaces" "sway/mode" "wlr/taskbar"];
# modules-center = ["sway/window" "custom/hello-from-waybar"];
# modules-right = ["mpd" "custom/mymodule#with-css-id" "temperature"];
# "sway/workspaces" = {
# disable-scroll = true;
# all-outputs = true;
# };
# "custom/hello-from-waybar" = {
# format = "hello {}";
# max-length = 40;
# interval = "once";
# exec = pkgs.writeShellScript "hello-from-waybar" ''
# echo "from within waybar"
# '';
# };
# };
};
};
wayland.windowManager.sway = {
enable = true;
systemd = {
@ -43,6 +163,7 @@
xkb_variant = "altgr-intl";
};
};
bars = [];
menu = "wofi -d";
modifier = "Mod4";
keybindings = with {
@ -73,8 +194,8 @@
# "${mod}+Shift+c" = "focus child";
# screenshot
# "${mod}+w" = "exec window-screenshot.sh";
# "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots";
# "${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots";
"${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots";
"${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots";
# "${mod}+t" = "exec ocr-screenshot.sh";
# rofi fuckery
@ -169,7 +290,7 @@
window = {
border = 2;
titlebar = true;
titlebar = false;
};
};
};

1
modules/desktop/firefox.nix
View file

@ -251,6 +251,7 @@
"app.shield.optoutstudies.enabled" = false;
"app.normandy.enabled" = false;
"app.normandy.api_url" = "";
"dom.private-attribution.submission.enabled" = false;
"browser.safebrowsing.malware.enabled" = false;
"browser.safebrowsing.phishing.enabled" = false;

9
modules/shell/nu.nix
View file

@ -22,10 +22,11 @@
package = config.users.defaultUserShell;
configFile.source = ../../other/config.nu;
envFile.source = ../../other/env.nu;
# extraConfig = ''
# source ${pkgs.nu_scripts}/share/nu_scripts/modules/nix/nix.nu;
# use ${pkgs.nu_scripts}/share/nu_scripts/modules/background_task/job.nu;
# '';
extraConfig = ''
plugin use ${pkgs.nushellPlugins.query}/bin/nu_plugin_query;
plugin use ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars;
plugin use ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats;
'';
};
programs.starship.enableNushellIntegration = true;
programs.carapace.enableNushellIntegration = true;