ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

working on i3

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-09-19 18:02:18 -05:00
parent e77dec2d94
commit e3689e5b26
9 changed files with 148 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/desktop_environment/default.nix
View file

@ -9,6 +9,7 @@ in
# ./hyprland # ./hyprland
./sway ./sway
./cosmic ./cosmic
./i3
]; ];
config = { config = {
assertions = [ assertions = [
@ -31,6 +32,10 @@ in
name = "cosmic"; name = "cosmic";
enabled = cfg.cosmic.enable; enabled = cfg.cosmic.enable;
} }
{
name = "i3";
enabled = cfg.i3.enable;
}
]; ];
in in
{ {

62
common/desktop_environment/i3/default.nix
View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
ccfg = import ../../config.nix; ccfg = import ../../config.nix;
cfg_path = [ cfg_path = [
@ -10,19 +15,21 @@ let
in in
with lib; with lib;
{ {
options = { options =
enable = lib.mkEnableOption "i3 (X11) desktop environment"; { }
terminalCommand = mkOption { // lib.attrsets.setAttrByPath cfg_path {
type = lib.types.str; enable = lib.mkEnableOption "i3 (X11) desktop environment";
default = "foot"; terminalCommand = mkOption {
description = "The terminal command to use."; type = lib.types.str;
default = "foot";
description = "The terminal command to use.";
};
extraOptions = mkOption {
type = lib.types.attrs;
default = { };
description = "Extra options for i3 configuration.";
};
}; };
extraOptions = mkOption {
type = lib.types.attrs;
default = { };
description = "Extra options for i3 configuration.";
};
};
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home-manager = { home-manager = {
@ -53,12 +60,29 @@ with lib;
XDG_SESSION_DESKTOP = "i3"; XDG_SESSION_DESKTOP = "i3";
}; };
environment.systemPackages = with pkgs; [ i3 i3status i3lock i3-gaps polybar maim xclip xterm ]; environment.systemPackages = with pkgs; [
i3
i3status
i3lock
i3-gaps
polybar
maim
xclip
xterm
# Enable backlight/brightness control, audio, etc., similar to sway defaults # Enable backlight/brightness control, audio, etc., similar to sway defaults
environment.systemPackages = lib.mkForce (with pkgs; [ polybar maim xclip i3 i3status i3lock i3-gaps pavucontrol btop nemo feh rofi ]); polybar
maim
# Allow users to add extra options into the generated i3 config xclip
# extraOptions can be appended by home-manager fragment i3
i3status
i3lock
i3-gaps
pavucontrol
btop
nemo
feh
rofi
];
}; };
} }

7
common/desktop_environment/i3/home_manager/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./i3.nix
./polybar.nix
];
}

4
common/desktop_environment/i3/home_manager/polybar.nix
View file

@ -13,10 +13,10 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.file = { home.file = {
".config/polybar/config" = { ".config/polybar/config" = {
text = builtins.readFile ../polybar/config; text = builtins.readFile ./polybar/config;
}; };
".config/polybar/launch.sh" = { ".config/polybar/launch.sh" = {
text = builtins.readFile ../polybar/launch.sh; text = builtins.readFile ./polybar/launch.sh;
executable = true; executable = true;
}; };
}; };

0
common/desktop_environment/i3/polybar/config → common/desktop_environment/i3/home_manager/polybar/config
View file

0
common/desktop_environment/i3/polybar/launch.sh → common/desktop_environment/i3/home_manager/polybar/launch.sh
View file

459
common/flake.lock generated
View file

@ -8,7 +8,7 @@
"ragenix", "ragenix",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1736955230, "lastModified": 1736955230,
@ -24,39 +24,6 @@
"type": "github" "type": "github"
} }
}, },
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1755946532,
"narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1741481578, "lastModified": 1741481578,
@ -95,25 +62,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -129,28 +80,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"hyprland",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -192,265 +121,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprcursor": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1753964049,
"narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprgraphics": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1755678602,
"narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "157cc52065a104fc3b8fa542ae648b992421d1c7",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprgraphics",
"type": "github"
}
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
"hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
"lastModified": 1756498600,
"narHash": "sha256-09FSU9GTVyDlTcXjsjzumfUkIJUwht1DESNh41kufdc=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "ea42041f936d5810c5cfa45d6bece12dde2fd9b6",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1749046714,
"narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-qt-support": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"systems"
]
},
"locked": {
"lastModified": 1749154592,
"narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprland-qtutils": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1753819801,
"narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1753622892,
"narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1756117388,
"narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1755184602,
"narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1739444422, "lastModified": 1739444422,
@ -483,39 +153,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1756542300,
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1756266583,
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741379970, "lastModified": 1741379970,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
@ -531,35 +169,12 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1755960406,
"narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"ragenix": { "ragenix": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
@ -579,9 +194,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs-unstable": "nixpkgs-unstable",
"ragenix": "ragenix" "ragenix": "ragenix"
} }
}, },
@ -608,16 +221,16 @@
}, },
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1681028828,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"type": "github" "type": "github"
} }
}, },
@ -635,62 +248,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1755354946,
"narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

164
hosts/oren/flake.lock generated
View file

@ -174,11 +174,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1756787288, "lastModified": 1758198701,
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1756886854, "lastModified": 1758216857,
"narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=", "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e6684e6c5755325f801bda1751a8a4038145d7d", "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1755648324, "lastModified": 1757952092,
"narHash": "sha256-+2TxwJEXWXGC7JBsRGUHtmQ66lRGPcDI2kFKTTU5e2s=", "narHash": "sha256-BcfTLFCU7elUJ2dwyt0iTjxsz/XLh+8ZygDcFwy6xPE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "226bb7c9df5f953fd7533e199b8d9e5475458a8a", "rev": "fd76dc9e7c68ac7c3941ba2af2bedcd79c5cf4ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755636100, "lastModified": 1757950300,
"narHash": "sha256-EeU6AfMISnXUmKdNHXN35srj+fuQiHoWx5uYRKCjsTE=", "narHash": "sha256-IQTP3jOmFNc2nphV9jdFbJXkmAN5Wj+/PIGmaZ8gP24=",
"owner": "CopilotC-Nvim", "owner": "CopilotC-Nvim",
"repo": "CopilotChat.nvim", "repo": "CopilotChat.nvim",
"rev": "f7bb32dbbe2ff5e26f5033e2142b5920cf427236", "rev": "87615648ff4dc852d1cf7ec099f0a7c37b1b2c87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +286,11 @@
"nvim_plugin-L3MON4D3/LuaSnip": { "nvim_plugin-L3MON4D3/LuaSnip": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1754037237, "lastModified": 1756990415,
"narHash": "sha256-JhTqTGQfIryJ7MElcOGOfb48uaNDnd9RM9Fl1Fs4QV0=", "narHash": "sha256-5FsUVPy8pAiwBh3c+bPDMtypFEHj6qIwGQIo3hjqV4M=",
"owner": "L3MON4D3", "owner": "L3MON4D3",
"repo": "LuaSnip", "repo": "LuaSnip",
"rev": "de10d8414235b0a8cabfeba60d07c24304e71f5c", "rev": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -302,11 +302,11 @@
"nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755631821, "lastModified": 1757910669,
"narHash": "sha256-+/GVSb3uQ5HktPv6HFwdywX85hScsAI1IHqXmwDH9PU=", "narHash": "sha256-PWbFcGRbTMRhDJrj+kx73HLduMLOSrAhZTLL2YgrAjQ=",
"owner": "MeanderingProgrammer", "owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim", "repo": "render-markdown.nvim",
"rev": "0087ee1d505d4fc4886d8d3121ae7848b7c0e49b", "rev": "2c6cf127c577712bd29d38f6391b3045c5f0180a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
"nvim_plugin-Saecki/crates.nvim": { "nvim_plugin-Saecki/crates.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1754466592, "lastModified": 1755956579,
"narHash": "sha256-b40E121rJrEmlor3fHmh4Y1TXKdfiqsBGBcpbY//eTw=", "narHash": "sha256-jfmST/S9ymwgQ99PTCOlJkk5zaxE5HiDV16TmTISDII=",
"owner": "Saecki", "owner": "Saecki",
"repo": "crates.nvim", "repo": "crates.nvim",
"rev": "a49df0f70171adc77704eac70dd2c0d179065933", "rev": "ac9fa498a9edb96dc3056724ff69d5f40b898453",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
"nvim_plugin-b0o/schemastore.nvim": { "nvim_plugin-b0o/schemastore.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755594039, "lastModified": 1757653237,
"narHash": "sha256-XU+PtvXlgoHFouyyceUIZ4L5AvZThUR2AegmCQAYt1A=", "narHash": "sha256-94NKAVWPV2sLkGWWL9G07QxA90Ise6tNWaYyKBcS/vI=",
"owner": "b0o", "owner": "b0o",
"repo": "schemastore.nvim", "repo": "schemastore.nvim",
"rev": "e906ac3ed0bd273781759e7635b5b824393c925c", "rev": "3146720ee3a0c6e2446eedd492fb519d16f2e467",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
"nvim_plugin-chrisgrieser/nvim-early-retirement": { "nvim_plugin-chrisgrieser/nvim-early-retirement": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755590055, "lastModified": 1757363000,
"narHash": "sha256-989Zf6SCy+vakFac4KmElUn8+ErJMtYJ8zlOi999UJI=", "narHash": "sha256-hfoJDD4ZKIx1IZjmZba117wRe3ELyGqG8ZqxDnRVmIk=",
"owner": "chrisgrieser", "owner": "chrisgrieser",
"repo": "nvim-early-retirement", "repo": "nvim-early-retirement",
"rev": "ef9fc0267da4204432ab7bf3ab9df359874cfeb6", "rev": "14aba23ce4168e6d6acbf78ab1d33739c3894f68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,11 +558,11 @@
"nvim_plugin-j-hui/fidget.nvim": { "nvim_plugin-j-hui/fidget.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755048367, "lastModified": 1755700851,
"narHash": "sha256-Hcnbk6go2vYCYqSfXLWQ+KimpU+NPbIkjBTKGMFoNQM=", "narHash": "sha256-KRlUqUdcliKpLnEJqyA2OAWto73F6iGTbMrsiAdc24M=",
"owner": "j-hui", "owner": "j-hui",
"repo": "fidget.nvim", "repo": "fidget.nvim",
"rev": "2cb5edb2dd6700a958a446b20bb2be04d318da9d", "rev": "4d5858bd4c471c895060e1b9f3575f1551184dc5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +590,11 @@
"nvim_plugin-lewis6991/gitsigns.nvim": { "nvim_plugin-lewis6991/gitsigns.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755014582, "lastModified": 1757668552,
"narHash": "sha256-zBUrqL+00Y8j4eVNAgI0nYn2i35zhQo2BVl4mL1cgfs=", "narHash": "sha256-L5WbNiFUn014hThvGfb5r858O6iLOBhOQHfVUdIlFI4=",
"owner": "lewis6991", "owner": "lewis6991",
"repo": "gitsigns.nvim", "repo": "gitsigns.nvim",
"rev": "6e3c66548035e50db7bd8e360a29aec6620c3641", "rev": "f780609807eca1f783a36a8a31c30a48fbe150c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -638,11 +638,11 @@
"nvim_plugin-m4xshen/hardtime.nvim": { "nvim_plugin-m4xshen/hardtime.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753760289, "lastModified": 1757738091,
"narHash": "sha256-BgJ0gKy/zxU82L7WocXLkXwD97pnCvpGyJVzSHeUtG0=", "narHash": "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0=",
"owner": "m4xshen", "owner": "m4xshen",
"repo": "hardtime.nvim", "repo": "hardtime.nvim",
"rev": "6d7664d5bdfaea44c5f50b29f5239fab7b00c273", "rev": "b4e431934af1fe224a3a801f632c008278cb7628",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -654,11 +654,11 @@
"nvim_plugin-mbbill/undotree": { "nvim_plugin-mbbill/undotree": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1752437854, "lastModified": 1756538456,
"narHash": "sha256-5WofUOTYE+Nmx3A5OoZBneJBHZ8bdGEYDZ6vTMx1OE0=", "narHash": "sha256-tudR+46nd63jY1VTCNEfZ2CofxCODXaHos0+NdFI6wU=",
"owner": "mbbill", "owner": "mbbill",
"repo": "undotree", "repo": "undotree",
"rev": "28f2f54a34baff90ea6f4a735ef1813ad875c743", "rev": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +670,11 @@
"nvim_plugin-mfussenegger/nvim-lint": { "nvim_plugin-mfussenegger/nvim-lint": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753951521, "lastModified": 1757878177,
"narHash": "sha256-GmXScmbXJx74RMgPhkdKtdODZqkOarFHE1XOiSnt5Bo=", "narHash": "sha256-8X9z0pRWx9xg9nQhhQtuOu3TunObg2CIgnlPXZtx86A=",
"owner": "mfussenegger", "owner": "mfussenegger",
"repo": "nvim-lint", "repo": "nvim-lint",
"rev": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594", "rev": "0864f81c681e15d9bdc1156fe3a17bd07db5a3ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -686,11 +686,11 @@
"nvim_plugin-mrcjkb/rustaceanvim": { "nvim_plugin-mrcjkb/rustaceanvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755599388, "lastModified": 1757809469,
"narHash": "sha256-4o20Hf+rFD2zejPZr5oe3ZkaynW3xAw/wtbF3sMjNnQ=", "narHash": "sha256-bijgDZozBNmHW3cASmOrQlaSE80d8V3XRxi1BNmfzRI=",
"owner": "mrcjkb", "owner": "mrcjkb",
"repo": "rustaceanvim", "repo": "rustaceanvim",
"rev": "eb9beab7d80eb052f78165b28d18f55844b26aef", "rev": "370b85298e5afdfd8b5d3da0c60c04e3873499a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -702,11 +702,11 @@
"nvim_plugin-neovim/nvim-lspconfig": { "nvim_plugin-neovim/nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755617152, "lastModified": 1757886255,
"narHash": "sha256-PSu5zQi/rzBAnALX8WrYckhqM5lI6hGAhsWWgS7ln7A=", "narHash": "sha256-lIlFgHkesAK7fRcoEEQO84/0BpE29dBgNzBnCv/0Tf0=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "5f1c9a90c8db9c647da40ce6cf5be9e49ccbf0c7", "rev": "d9879110d0422a566fa01d732556f4d5515e1738",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -718,11 +718,11 @@
"nvim_plugin-nosduco/remote-sshfs.nvim": { "nvim_plugin-nosduco/remote-sshfs.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755623332, "lastModified": 1755703322,
"narHash": "sha256-hnTDzd3eRsDUYYf9WPknYZ126d0XKXO1hjlY7WH4bDI=", "narHash": "sha256-xy+50CsRd0LfRyDtNNMI8KhzvjH2nt8ogwiXf7H3fYY=",
"owner": "nosduco", "owner": "nosduco",
"repo": "remote-sshfs.nvim", "repo": "remote-sshfs.nvim",
"rev": "8ab43934caea0eacc986d112e5680c316b8a7944", "rev": "8b0974c0e23ef086f5598ebbb1980257171dc370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -846,11 +846,11 @@
"nvim_plugin-nvim-tree/nvim-tree.lua": { "nvim_plugin-nvim-tree/nvim-tree.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755174669, "lastModified": 1757312802,
"narHash": "sha256-Cdd7m2ondica5yDgm8THEm8LttJwDWQTNPnKO4vKr2c=", "narHash": "sha256-Km+PWXJJLl8zsBjwIGL//qT/eUEZna4yYRPsWXMXG1E=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "f0e9951778802526b14c934f7bf746e1e0ae5ed0", "rev": "e179ad2f83b5955ab0af653069a493a1828c2697",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -862,11 +862,11 @@
"nvim_plugin-nvim-tree/nvim-web-devicons": { "nvim_plugin-nvim-tree/nvim-web-devicons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1754884337, "lastModified": 1756936794,
"narHash": "sha256-Zftd4xFYdCtof6IusN+E079yY2oMTNhJ/yznvLiiur0=", "narHash": "sha256-2Q6ZZQj5HFXTw1YwX3ibdGOTwfbfPUBbcPOsuBUpSjc=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-web-devicons", "repo": "nvim-web-devicons",
"rev": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a", "rev": "6e51ca170563330e063720449c21f43e27ca0bc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -878,11 +878,11 @@
"nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1754488703, "lastModified": 1757521884,
"narHash": "sha256-f4a9Abwb265Rm+hpUXz+rKWXvaFVrmXf1h7d7eh9jJc=", "narHash": "sha256-+yj8bstmffVByX3Z/1vkUYdXvpmWGbPt+RDfkBnV11w=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-context", "repo": "nvim-treesitter-context",
"rev": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61", "rev": "41847d3dafb5004464708a3db06b14f12bde548a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -910,11 +910,11 @@
"nvim_plugin-rcarriga/nvim-notify": { "nvim_plugin-rcarriga/nvim-notify": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753086914, "lastModified": 1757190131,
"narHash": "sha256-uQBB3fajHowivArxbtmEJvVU3+QO0VApYpVNMA58UkI=", "narHash": "sha256-h7STMjY+CBTqBkIDJXgtJz4WhNeQ02ES2Jesi3jZXeM=",
"owner": "rcarriga", "owner": "rcarriga",
"repo": "nvim-notify", "repo": "nvim-notify",
"rev": "397c7c1184745fca649e5104de659e6392ef5a4d", "rev": "8701bece920b38ea289b457f902e2ad184131a5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -926,11 +926,11 @@
"nvim_plugin-rmagatti/auto-session": { "nvim_plugin-rmagatti/auto-session": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755285297, "lastModified": 1757864222,
"narHash": "sha256-x8oPN7JqcY0scFO0vGREerT3dRiQA+k/qeWsug1sGiU=", "narHash": "sha256-FbN36vVLX3DUXwefTbi6511R6KTHqLiNHeAR0kXiarg=",
"owner": "rmagatti", "owner": "rmagatti",
"repo": "auto-session", "repo": "auto-session",
"rev": "d27a29f5754e3a8b8d89a4069814e53ac583e951", "rev": "5a269bb5bec50b8b60564aa00f6454d9e82fbe8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -990,11 +990,11 @@
"nvim_plugin-stevearc/conform.nvim": { "nvim_plugin-stevearc/conform.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755640282, "lastModified": 1756334700,
"narHash": "sha256-WYGvppnMsBaVYnMmv9WJRuKuyk4F/rzJ3DRBh+72tRY=", "narHash": "sha256-j9TOSx2L19AHABdg9pLtmEUtPOCIUSo0qe2YUPBlZ5g=",
"owner": "stevearc", "owner": "stevearc",
"repo": "conform.nvim", "repo": "conform.nvim",
"rev": "04bfa5f35706410376bf7618a01fcf44e3f35b59", "rev": "b4aab989db276993ea5dcb78872be494ce546521",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1070,11 +1070,11 @@
"nvim_plugin-windwp/nvim-ts-autotag": { "nvim_plugin-windwp/nvim-ts-autotag": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739910276, "lastModified": 1757545454,
"narHash": "sha256-a3Bcql68mp3y5bH9XMiDTQB0e75T+qFB593objIGg/I=", "narHash": "sha256-nT2W5gKFEfzP7MztLjm7yqwam3ADk0svcMdLg2nmI/4=",
"owner": "windwp", "owner": "windwp",
"repo": "nvim-ts-autotag", "repo": "nvim-ts-autotag",
"rev": "a1d526af391f6aebb25a8795cbc05351ed3620b5", "rev": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1102,11 +1102,11 @@
"nvim_plugin-zbirenbaum/copilot.lua": { "nvim_plugin-zbirenbaum/copilot.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755448417, "lastModified": 1757884406,
"narHash": "sha256-KV+Wno4aB5uTSBxIZzQKC/0KfjQLM7x8wCDkVSnaPeA=", "narHash": "sha256-sXobILIsV4nnk9//PbFT4L1BsHP1xSJiuibVbGwYXJ8=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot.lua", "repo": "copilot.lua",
"rev": "3fd7b50810ae4cccf8b38e4c509b1608f141a9e9", "rev": "8aebaa3a102125fedf08c98773a0a8def92fff37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1206,11 +1206,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1755648539, "lastModified": 1758041510,
"narHash": "sha256-zElmY3ieHOxJtn5Q3KKXZw3i6/e63jRtHowzOM4jERw=", "narHash": "sha256-vcK6ZwAWNfjdDFYKLVrWk+azva58AiDpm8nMfIniFWA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1f8444ad78e85c902818ab48479f3f3a1e909031", "rev": "b3dbdf3f7360747987bf38bcdd9baf01b4906929",
"revCount": 300, "revCount": 304,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/nvim" "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
}, },
@ -1249,11 +1249,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755571033, "lastModified": 1757930296,
"narHash": "sha256-V8gmZBfMiFGCyGJQx/yO81LFJ4d/I5Jxs2id96rLxrM=", "narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "95487740bb7ac11553445e9249041a6fa4b5eccf", "rev": "09442765a05c2ca617c20ed68d9613da92a2d96b",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
hosts/oren/flake.nix
View file

@ -77,11 +77,7 @@
reporting.enable = true; reporting.enable = true;
}; };
secrets.enable = true; secrets.enable = true;
desktopEnvironment.sway = { desktopEnvironment.i3.enable = true;
enable = true;
waybar.enable = true;
swaync.enable = true;
};
programs = { programs = {
qFlipper.enable = true; qFlipper.enable = true;
rustDev.enable = true; rustDev.enable = true;