fw/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: fw:1dd4440047c5d95910bfeebe8a13c271f11f7980
Branches Tags
fw:main
fw:refactr
..
compare: fw:c03fa07723d38e2ff5e8041cb28deb3738fefb40
Branches Tags
fw:main
fw:refactr

No commits in common. "1dd4440047c5d95910bfeebe8a13c271f11f7980" and "c03fa07723d38e2ff5e8041cb28deb3738fefb40" have entirely different histories.
1dd4440047 ... c03fa07723

14 changed files with 213 additions and 585 deletions
Download patch file Download diff file Expand all files Collapse all files

323
flake.lock generated
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775558810, "lastModified": 1774211390,
"narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=", "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "7371b669b22aa2af980f913fc312a786d2f1abb2", "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1775994227, "lastModified": 1774616169,
"narHash": "sha256-4VKeWtl9dEubrgpy9fSXkXbjBZlNXPNlQQM5l1ppHv4=", "narHash": "sha256-fP4bU3SOH5sefSl6EagqULFs+bXoo3h3VLQCCyJplo4=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "d0a9a21ed8e235956a768fc624242ec9a3e15575", "rev": "e616c61cd9f7b05b32af266bc005fa266860dacf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,11 +181,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1775176642, "lastModified": 1764873433,
"narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "179704030c5286c729b5b0522037d1d51341022c", "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,54 +211,12 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"hister",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1772408722, "lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
@ -273,19 +231,19 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"stylix", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1769996383,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,7 +252,28 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_5": { "flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1767609335,
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_4": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@ -371,37 +350,20 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.gnome.org",
"lastModified": 1767737596, "lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab"
"type": "github"
}
},
"hister": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1777116211,
"narHash": "sha256-achnOU3FcehBOSsBKMtAUsu0Sw2+0QSdU3FpojewcR4=",
"owner": "asciimoo",
"repo": "hister",
"rev": "87a1acc07fb6ddba4c58050cf89179ac16653279",
"type": "github"
},
"original": {
"owner": "asciimoo",
"repo": "hister",
"type": "github"
} }
}, },
"home-manager": { "home-manager": {
@ -411,11 +373,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776136611, "lastModified": 1774647770,
"narHash": "sha256-b2pu3Pb28W0bJzQVP3OJHZC5+dgOOeqjlli2WVakKEU=", "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a423e444b17dde406097328604a64fc7429e34e", "rev": "02371c05a04a2876cf92e2d67a259e8f87399068",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -469,11 +431,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775496928, "lastModified": 1772461523,
"narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=", "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e", "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -493,17 +455,17 @@
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire", "hyprwire": "hyprwire",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2", "systems": "systems_2",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1776115177, "lastModified": 1774635054,
"narHash": "sha256-WrJ+Lsb86tU/ZtBER2cw4r6l/lp1mclXhHZYnlMcyFU=", "narHash": "sha256-NVjEJ5u0VHKTc/A17kWDfXgFnBAsP2BOMNj+fAv58mM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "e539d21174211dad3fa5f8f5e8496bb7e5c7baf2", "rev": "5dfb1033a433789021ab9f94b9044e6f32496211",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,11 +507,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774710575, "lastModified": 1772467975,
"narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=", "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-guiutils", "repo": "hyprland-guiutils",
"rev": "0703df899520001209646246bef63358c9881e36", "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +638,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774911391, "lastModified": 1774211405,
"narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", "rev": "cb4e152dc72095a2af422956c6b689590572231a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -730,11 +692,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775414057, "lastModified": 1773074819,
"narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=", "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwire", "repo": "hyprwire",
"rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490", "rev": "f68afd0e73687598cc2774804fedad76693046f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -750,11 +712,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775123884, "lastModified": 1767599588,
"narHash": "sha256-HjvJ2bD0YvbTdOLo+s+Iw7Sx7IwobC3KP9HXYd0KCIE=", "narHash": "sha256-T5eoG861JJdGj6swp4+icjzwtSB5TY4efy5FeYbgHeg=",
"owner": "niksingh710", "owner": "niksingh710",
"repo": "minimal-tmux-status", "repo": "minimal-tmux-status",
"rev": "f3096808cfca41007eacc76a686004ab6a394a0e", "rev": "67e2f5205de1b46f99af1d92013fb38fec5b05d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -765,16 +727,16 @@
}, },
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1776125101, "lastModified": 1774656308,
"narHash": "sha256-xD5YBoSyqDz+rTZzfs0r5Msa9AlJsgDweYOptLlx2AY=", "narHash": "sha256-k+L2Q5DtNGkPy+JgfhpTxpngdxy+FVz269iNfCYVy5E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "80b1f16dba171a70c44c2ee6ec9529876152a7f5", "rev": "114911d841b928b2b147511bec7121af310d7a23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -786,11 +748,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1776118534, "lastModified": 1774652330,
"narHash": "sha256-1avpN21oJ+w1jQ0r1XtoAPMzhSzEvgBMxCk3dO8SihU=", "narHash": "sha256-dqlsjRaLgD87D8YaC8842bhYziuRQ2qvTDgQDKL1ttQ=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "7bb8231577d11b31cbc85b563c6bc299b64957d4", "rev": "f027f41e2cfba7be8c4841cb1a036827375bbd73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +763,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1774386573,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -848,11 +810,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1775423009, "lastModified": 1773821835,
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -880,43 +842,27 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1776329215, "lastModified": 1774106199,
"narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b86751bc4085f48661017fa226dee99fab6c651b", "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1775423009, "lastModified": 1774273680,
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1775888245,
"narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "13043924aaa7375ce482ebe2494338e058282925",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -926,13 +872,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1774386573,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -942,13 +888,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1774386573,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -960,18 +906,18 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1776128025, "lastModified": 1774612943,
"narHash": "sha256-spZM5zll0cBPHHSZPioZREArzCsllurKQsJME08nnXY=", "narHash": "sha256-hRhq5cpDyBm/ZQyuzI+/YzQEVt35d/M6ko7ADfodw9s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0a12693297d23f1b3af04ba6112b5936e2eba41b", "rev": "2b9f8e1d659d1c7664e1b85ab1620c219672696c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -992,11 +938,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775228139, "lastModified": 1767810917,
"narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1007,7 +953,7 @@
}, },
"powershell-es": { "powershell-es": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1771417904, "lastModified": 1771417904,
@ -1034,11 +980,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775036584, "lastModified": 1774104215,
"narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", "rev": "f799ae951fde0627157f40aec28dec27b22076d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1053,12 +999,11 @@
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"confetti": "confetti", "confetti": "confetti",
"disko": "disko", "disko": "disko",
"hister": "hister",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"minimal-tmux": "minimal-tmux", "minimal-tmux": "minimal-tmux",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"nixpkgs-azure-cli": "nixpkgs-azure-cli", "nixpkgs-azure-cli": "nixpkgs-azure-cli",
"nixvim": "nixvim", "nixvim": "nixvim",
"powershell-es": "powershell-es", "powershell-es": "powershell-es",
@ -1096,11 +1041,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776119890, "lastModified": 1774303811,
"narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1116,24 +1061,25 @@
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_3",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nur": "nur", "nur": "nur",
"systems": "systems_4", "systems": "systems_4",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1776128773, "lastModified": 1774124764,
"narHash": "sha256-aV7fNAdum23uirlIEgRNq+Tz0bn0+asbYqaA/pCV8No=", "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "43e20cee100e5578eb8e709bec960e26ce653adf", "rev": "e31c79f571c5595a155f84b9d77ce53a84745494",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1202,6 +1148,23 @@
"type": "github" "type": "github"
} }
}, },
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1221,11 +1184,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772661346, "lastModified": 1767710407,
"narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "13b5b0c299982bb361039601e2d72587d6846294", "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1237,11 +1200,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772934010, "lastModified": 1767489635,
"narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1253,11 +1216,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772909925, "lastModified": 1767488740,
"narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1268,7 +1231,7 @@
}, },
"typsite": { "typsite": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -1295,11 +1258,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777128769, "lastModified": 1774688817,
"narHash": "sha256-DP+KayU1TFjUo9ZY0TNvalNP8HzZsOhxPKRTd34G0mk=", "narHash": "sha256-Jmc51QARSI/Mpp4FH2sq2UAA+rag4XMwkr4c2IB4nvc=",
"ref": "simplify-static-html", "ref": "simplify-static-html",
"rev": "b168d315f718fa69d69630f2db741d12edb1ec2a", "rev": "4a05531e4478c6376146d6f5daffe5e3734fb1cb",
"revCount": 36, "revCount": 31,
"type": "git", "type": "git",
"url": "ssh://git@github.com/fwastring/wedding.git" "url": "ssh://git@github.com/fwastring/wedding.git"
}, },

4
flake.nix
View file

@ -4,7 +4,6 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
hister.url = "github:asciimoo/hister";
nixpkgs-azure-cli.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-azure-cli.url = "github:NixOS/nixpkgs/nixos-24.11";
stylix = { stylix = {
url = "github:nix-community/stylix"; url = "github:nix-community/stylix";
@ -49,7 +48,7 @@
sops-nix, sops-nix,
catppuccin, catppuccin,
confetti, confetti,
hister, powershell-es,
bbk, bbk,
nixvim, nixvim,
disko, disko,
@ -134,7 +133,6 @@
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
catppuccin.nixosModules.catppuccin catppuccin.nixosModules.catppuccin
confetti.nixosModules.default confetti.nixosModules.default
hister.nixosModules.default
# bbk.nixosModules.default # bbk.nixosModules.default
nixvim.nixosModules.default nixvim.nixosModules.default
]; ];

116
maskiner/core/configuration.nix
View file

@ -81,47 +81,17 @@ in
group = "users"; group = "users";
mode = "0400"; mode = "0400";
}; };
sops.secrets.google_oauth_client_id_core = { sops.secrets.google_oauth_client_id = {
owner = "fw"; owner = "fw";
group = "users"; group = "users";
mode = "0400"; mode = "0400";
}; };
sops.secrets.google_oauth_client_secret_core = { sops.secrets.google_oauth_client_secret = {
owner = "fw"; owner = "fw";
group = "users"; group = "users";
mode = "0400"; mode = "0400";
}; };
sops.secrets.user_google_email_core = { sops.secrets.user_google_email = {
owner = "fw";
group = "users";
mode = "0400";
};
sops.secrets.mssql_server_core = {
owner = "fw";
group = "users";
mode = "0400";
};
sops.secrets.mssql_database_core = {
owner = "fw";
group = "users";
mode = "0400";
};
sops.secrets.mssql_user_core = {
owner = "fw";
group = "users";
mode = "0400";
};
sops.secrets.mssql_password_core = {
owner = "fw";
group = "users";
mode = "0400";
};
sops.secrets.vault_addr_core = {
owner = "fw";
group = "users";
mode = "0400";
};
sops.secrets.vault_token_core = {
owner = "fw"; owner = "fw";
group = "users"; group = "users";
mode = "0400"; mode = "0400";
@ -129,62 +99,6 @@ in
environment.systemPackages = [ pkgs.cifs-utils ]; environment.systemPackages = [ pkgs.cifs-utils ];
# Ollama service for running local LLMs
services.ollama = {
enable = true;
package = pkgs.ollama-rocm; # AMD GPU support
# Optional: specify host and port if you want to access from other machines
# host = "0.0.0.0";
# port = 11434;
};
services.hister = {
enable = true;
# Optional: Set via Nix options (takes precedence over config file)
# port = 4433;
dataDir = "/var/lib/hister"; # NixOS Recommend: "/var/lib/hister"
# Home-Manager Recommend: "~/.local/share/hister"
# Darwin Recommend: "~/Library/Application Support/hister"
# Optional (NixOS only): open `port` in the system firewall.
# Setting `port` alone no longer mutates the firewall.
# openFirewall = true;
# Optional: Use existing YAML config file
# configPath = /path/to/config.yml;
# Optional: Inject secrets (e.g. HISTER__APP__ACCESS_TOKEN) via a
# systemd EnvironmentFile instead of placing them in the world-readable
# Nix store. Honored by the NixOS module and the Linux home-manager
# user service; ignored on launchd (Darwin).
# environmentFile = "/run/secrets/hister.env";
# Optional: Inline configuration (rendered to YAML and passed via HISTER_CONFIG)
# Note: Only one of configPath or settings can be used.
# Accepts any key the server accepts — see the upstream `app`, `server`,
# `indexer`, `crawler`, `hotkeys`, `extractors`, and
# `sensitive_content_patterns` blocks.
settings = {
app = {
search_url = "https://google.com/search?q={query}";
log_level = "info";
};
server = {
address = "127.0.0.1:4433";
database = "db.sqlite3";
};
hotkeys = {
"/" = "focus_search_input";
"enter" = "open_result";
"alt+enter" = "open_result_in_new_tab";
"alt+j" = "select_next_result";
"alt+k" = "select_previous_result";
"alt+o" = "open_query_in_search_engine";
};
};
};
systemd.services.fleet-osquery = { systemd.services.fleet-osquery = {
description = "osquery enrolled to Fleet"; description = "osquery enrolled to Fleet";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -232,20 +146,6 @@ in
]; ];
}; };
fileSystems."/mnt/testdb/C" = {
device = "//192.168.0.203/C$";
fsType = "cifs";
options =
let
automount_opts =
"x-systemd.automount,noauto,x-systemd.idle-timeout=60,"
+ "x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
in
[
"${automount_opts},credentials=${toString config.sops.secrets.build-service.path},vers=3.0"
];
};
fileSystems."/mnt/elastic-internal/C" = { fileSystems."/mnt/elastic-internal/C" = {
device = "//192.168.0.204/C$"; device = "//192.168.0.204/C$";
fsType = "cifs"; fsType = "cifs";
@ -316,18 +216,14 @@ in
]; ];
}; };
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = { inherit inputs pkgs; };
inherit inputs pkgs myhostname;
};
home-manager.users.fw = { home-manager.users.fw = {
opencode.mcpEnabled = { opencode.mcpEnabled = {
az = false; az = true;
k8s = true; k8s = true;
github = true; github = true;
jira = false; jira = true;
google = true; google = true;
mssql = true;
vault = false;
}; };
imports = [ imports = [
./../../moduler/home.nix ./../../moduler/home.nix

4
maskiner/gammal/configuration.nix
View file

@ -52,9 +52,7 @@ in
theme = theme; theme = theme;
}; };
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = { inherit inputs pkgs; };
inherit inputs pkgs myhostname;
};
home-manager.users.fw = { home-manager.users.fw = {
imports = [ imports = [
./../../moduler/home.nix ./../../moduler/home.nix

13
maskiner/styrelsen/configuration.nix
View file

@ -30,7 +30,7 @@ in
(modulesDirectory + /programs/hyprland) (modulesDirectory + /programs/hyprland)
(modulesDirectory + /programs/kubernetes-tools.nix) (modulesDirectory + /programs/kubernetes-tools.nix)
(modulesDirectory + /programs/nixvim) (modulesDirectory + /programs/nixvim)
(modulesDirectory + /programs/neomd) (modulesDirectory + /programs/neomd)
]; ];
kubernetes-tools.enable = true; kubernetes-tools.enable = true;
@ -54,17 +54,17 @@ in
sops.defaultSopsFile = ../../secrets/sops.yaml; sops.defaultSopsFile = ../../secrets/sops.yaml;
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
sops.secrets.google_oauth_client_id_styrelsen = { sops.secrets.google_oauth_client_id = {
owner = "fw"; owner = "fw";
group = "users"; group = "users";
mode = "0400"; mode = "0400";
}; };
sops.secrets.google_oauth_client_secret_styrelsen = { sops.secrets.google_oauth_client_secret = {
owner = "fw"; owner = "fw";
group = "users"; group = "users";
mode = "0400"; mode = "0400";
}; };
sops.secrets.user_google_email_styrelsen = { sops.secrets.user_google_email = {
owner = "fw"; owner = "fw";
group = "users"; group = "users";
mode = "0400"; mode = "0400";
@ -75,9 +75,7 @@ in
theme = theme; theme = theme;
}; };
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = { inherit inputs pkgs; };
inherit inputs pkgs myhostname;
};
home-manager.users.fw = { home-manager.users.fw = {
opencode.mcpEnabled = { opencode.mcpEnabled = {
az = false; az = false;
@ -85,7 +83,6 @@ in
github = false; github = false;
jira = false; jira = false;
google = true; google = true;
mssql = false;
}; };
imports = [ imports = [
./../../moduler/home.nix ./../../moduler/home.nix

97
moduler/fish.nix
View file

@ -82,90 +82,41 @@ in
fzfOpts = catppuccinFzfOptions.${config.fish.theme}; fzfOpts = catppuccinFzfOptions.${config.fish.theme};
in in
'' ''
fish_vi_key_bindings fish_vi_key_bindings
set fish_greeting set fish_greeting
set FLAKE_DIR "/home/fw/nix" set FLAKE_DIR "/home/fw/nix"
set -l host_name (hostname) if test -r /run/secrets/jira_token
set -gx JIRA_API_TOKEN (string trim (cat /run/secrets/jira_token))
function load_secret --argument-names env_name preferred_secret fallback_secret end
if test -r "/run/secrets/$preferred_secret" if test -r /run/secrets/google_oauth_client_id
set -gx $env_name (string trim (cat "/run/secrets/$preferred_secret")) set -gx GOOGLE_OAUTH_CLIENT_ID (string trim (cat /run/secrets/google_oauth_client_id))
else if test -r "/run/secrets/$fallback_secret" end
set -gx $env_name (string trim (cat "/run/secrets/$fallback_secret")) if test -r /run/secrets/google_oauth_client_secret
end set -gx GOOGLE_OAUTH_CLIENT_SECRET (string trim (cat /run/secrets/google_oauth_client_secret))
end end
if test -r /run/secrets/user_google_email
if test -r /run/secrets/jira_token set -gx USER_GOOGLE_EMAIL (string trim (cat /run/secrets/user_google_email))
set -gx JIRA_API_TOKEN (string trim (cat /run/secrets/jira_token)) end
end set -gx GITHUB_PERSONAL_ACCESS_TOKEN (cat /run/secrets/github_token)
load_secret GOOGLE_OAUTH_CLIENT_ID "google_oauth_client_id_$host_name" google_oauth_client_id set -gx GITHUB_HOST "https://github.com"
load_secret GOOGLE_OAUTH_CLIENT_SECRET "google_oauth_client_secret_$host_name" google_oauth_client_secret set -gx GRAFANA_SERVICE_ACCOUNT_TOKEN (cat /run/secrets/grafana_token)
load_secret USER_GOOGLE_EMAIL "user_google_email_$host_name" user_google_email
load_secret MSSQL_SERVER "mssql_server_$host_name" mssql_server
load_secret MSSQL_DATABASE "mssql_database_$host_name" mssql_database
load_secret MSSQL_USER "mssql_user_$host_name" mssql_user
load_secret MSSQL_PASSWORD "mssql_password_$host_name" mssql_password
load_secret MSSQL_PORT "mssql_port_$host_name" mssql_port
load_secret MSSQL_ENCRYPT "mssql_encrypt_$host_name" mssql_encrypt
load_secret MSSQL_WINDOWS_AUTH "mssql_windows_auth_$host_name" mssql_windows_auth
load_secret VAULT_ADDR "vault_addr_$host_name" vault_addr
load_secret VAULT_TOKEN "vault_token_$host_name" vault_token
load_secret VAULT_NAMESPACE "vault_namespace_$host_name" vault_namespace
set -gx GITHUB_PERSONAL_ACCESS_TOKEN (cat /run/secrets/github_token)
set -gx GITHUB_HOST "https://github.com"
set -gx GRAFANA_SERVICE_ACCOUNT_TOKEN (cat /run/secrets/grafana_token)
set -gx GRAFANA_URL "https://monitoring.internalifacts.se" set -gx GRAFANA_URL "https://monitoring.internalifacts.se"
set -Ux FZF_CTRL_R_OPTS "--reverse" set -Ux FZF_CTRL_R_OPTS "--reverse"
set -Ux FZF_TMUX_OPTS "-p" set -Ux FZF_TMUX_OPTS "-p"
set -e GOROOT set -e GOROOT
set -x -U GOPATH $HOME/.go set -x -U GOPATH $HOME/.go
gh completion -s fish > ~/.config/fish/completions/gh.fish gh completion -s fish > ~/.config/fish/completions/gh.fish
set -gx PATH $PATH $HOME/scripts set -gx PATH $PATH $HOME/scripts
set -gx PATH $PATH $HOME/.krew/bin set -gx PATH $PATH $HOME/.krew/bin
set -gx OPENCODE_DEFAULT_PROMPT_FILE "$HOME/.config/opencode/session-prompt.txt"
function oc
set -l passthrough_subcommands completion acp mcp attach debug providers auth agent upgrade uninstall serve web models stats export import github pr session plugin plug db
if test (count $argv) -gt 0
if string match -qr '^-' -- "$argv[1]"
command opencode $argv
return $status
end
for arg in $argv
if test "$arg" = "--prompt"
command opencode $argv
return $status
end
end
if contains -- "$argv[1]" $passthrough_subcommands
command opencode $argv
return $status
end
end
if test -r "$OPENCODE_DEFAULT_PROMPT_FILE"
set -l session_prompt (string collect < "$OPENCODE_DEFAULT_PROMPT_FILE")
command opencode --prompt "$session_prompt" $argv
else
command opencode $argv
end
end
complete -e -c oc
complete -c oc -w opencode
if not set -q SSH_AUTH_SOCK if not set -q SSH_AUTH_SOCK
eval (ssh-agent -c) eval (ssh-agent -c)
ssh-add ~/.ssh/id_ed25519 >/dev/null 2>&1 ssh-add ~/.ssh/id_ed25519 >/dev/null 2>&1
set SSH_AUTH_SOCK /home/fw/.bitwarden-ssh-agent.sock set SSH_AUTH_SOCK /home/fw/.bitwarden-ssh-agent.sock
end end
set -Ux FZF_DEFAULT_OPTS "${fzfOpts}" set -Ux FZF_DEFAULT_OPTS "${fzfOpts}"
functions -e load_secret
''; '';
}; };
}; };

84
moduler/home.nix
View file

@ -8,7 +8,6 @@
}: }:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
googleWorkspaceStateDir = "/home/fw/.local/share/google-workspace-mcp/${myhostname}";
in in
{ {
options.opencode.mcpEnabled = mkOption { options.opencode.mcpEnabled = mkOption {
@ -19,8 +18,6 @@ in
github = true; github = true;
jira = true; jira = true;
google = false; google = false;
mssql = false;
vault = false;
}; };
description = "Per-host MCP enablement flags for OpenCode servers."; description = "Per-host MCP enablement flags for OpenCode servers.";
}; };
@ -51,22 +48,6 @@ in
"$schema" = "https://opencode.ai/config.json"; "$schema" = "https://opencode.ai/config.json";
theme = lib.mkForce "catppuccin"; theme = lib.mkForce "catppuccin";
plugin = [ "@ex-machina/opencode-anthropic-auth" ]; plugin = [ "@ex-machina/opencode-anthropic-auth" ];
provider = {
ollama = {
npm = "@ai-sdk/openai-compatible";
options = {
baseURL = "http://localhost:11434/v1";
};
models = {
# Only include models that support function calling (tools)
"gemma2:latest" = {};
"llama3.1:8b" = {};
"qwen2.5-coder:14b" = {};
"qwen2.5-coder:32b" = {};
# Note: deepseek-coder models and codellama:13b don't support tools
};
};
};
mcp = { mcp = {
az = { az = {
type = "local"; type = "local";
@ -131,12 +112,12 @@ in
"run" "run"
"-i" "-i"
"--rm" "--rm"
"--network" "--network"
"host" "host"
"--user" "--user"
"1000:100" "1000:100"
"-v" "-v"
"${googleWorkspaceStateDir}:/home/app/.google_workspace_mcp" "/home/fw/.local/share/google-workspace-mcp:/home/app/.google_workspace_mcp"
"-e" "-e"
"GOOGLE_OAUTH_CLIENT_ID" "GOOGLE_OAUTH_CLIENT_ID"
"-e" "-e"
@ -153,38 +134,6 @@ in
]; ];
enabled = config.opencode.mcpEnabled.google or false; enabled = config.opencode.mcpEnabled.google or false;
}; };
mssql = {
type = "local";
command = [
"nix"
"shell"
"nixpkgs#uv"
"nixpkgs#freetds"
"-c"
"uvx"
"--from"
"git+https://github.com/RichardHan/mssql_mcp_server.git@77b0c6a9771e3f83a54c03dad42f1a53e0a20d0e"
"mssql_mcp_server"
];
enabled = config.opencode.mcpEnabled.mssql or false;
};
vault = {
type = "local";
command = [
"docker"
"run"
"-i"
"--rm"
"-e"
"VAULT_ADDR"
"-e"
"VAULT_TOKEN"
"-e"
"VAULT_NAMESPACE"
"hashicorp/vault-mcp-server"
];
enabled = config.opencode.mcpEnabled.vault or false;
};
}; };
}; };
}; };
@ -196,33 +145,6 @@ in
fi fi
''; '';
home.activation.googleWorkspaceMcpState = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
mkdir -p "${googleWorkspaceStateDir}"
'';
home.file.".config/opencode/session-prompt.txt".text = ''
Session instructions for this entire chat:
1) Tooling / binaries
- Always use Nix for binaries and tool execution.
- Prefer `nix shell nixpkgs#<tool> -c <command>` (or `nix develop -c <command>` if the repo already defines a dev shell).
- Do not run tools directly from global/system installs unless I explicitly ask.
2) Daily note logging
- Track general work notes in: /home/fw/knowledge/notes/daily
- Use today's daily note file (create it if missing) and keep it updated as work progresses.
- Add short, timestamped entries for meaningful actions/decisions.
3) Schedule updates
- In today's daily note, maintain a "Schedule" section/tab and keep it current with what we are actively doing.
- When tasks change, update Schedule first, then continue implementation.
- Keep Schedule concise and action-oriented.
4) Working style
- Don't ask for confirmation on normal steps; proceed with sensible defaults.
- Only ask when blocked, destructive, or security-sensitive.
'';
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
# theme = "catppuccin_${theme}"; # theme = "catppuccin_${theme}";

5
moduler/programs.nix
View file

@ -83,9 +83,8 @@
slurp slurp
bitwarden-desktop bitwarden-desktop
jira-cli-go jira-cli-go
chromium
vault dbeaver-bin
dbeaver-bin
( (
let let
base = pkgs.appimageTools.defaultFhsEnvArgs; base = pkgs.appimageTools.defaultFhsEnvArgs;

8
moduler/programs/beets/default.nix
View file

@ -15,9 +15,6 @@ let
move: yes move: yes
write: yes write: yes
paths:
default: $albumartist/$album ($year)/$track $title
fetchart: fetchart:
auto: yes auto: yes
@ -63,8 +60,7 @@ in
"BEETSCONFIG=${config.xdg.configHome}/beets/config.yaml" "BEETSCONFIG=${config.xdg.configHome}/beets/config.yaml"
]; ];
}; };
Install = { Install = { WantedBy = [ "default.target" ]; };
WantedBy = [ "default.target" ];
};
}; };
} }

2
moduler/programs/hyprland/default.nix
View file

@ -285,12 +285,10 @@ with lib;
"$mod, l, movefocus, r" "$mod, l, movefocus, r"
"$mod, k, movefocus, u" "$mod, k, movefocus, u"
"$mod, j, movefocus, d" "$mod, j, movefocus, d"
"$mod, b, exec, pkill -INT .waybar-wrapped"
# Applications # Applications
"$mod, q, exec, ${pkgs.librewolf}/bin/librewolf" "$mod, q, exec, ${pkgs.librewolf}/bin/librewolf"
"$mod, d, exec, ${pkgs.rofi}/bin/rofi -show drun -p 'Run: '" "$mod, d, exec, ${pkgs.rofi}/bin/rofi -show drun -p 'Run: '"
", F19, exec, ${pkgs.rofi}/bin/rofi -show drun -p 'Run: '"
# Screencapture # Screencapture
"$mod SHIFT, s, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png" "$mod SHIFT, s, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png"

38
moduler/programs/nixvim/default.nix
View file

@ -263,25 +263,25 @@ with lib;
# }; # };
# }; # };
# treesitter = { treesitter = {
# enable = true; enable = true;
#
# grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
# bash bash
# json json
# lua lua
# make make
# markdown markdown
# helm helm
# nix nix
# regex regex
# toml toml
# vim vim
# vimdoc vimdoc
# xml xml
# yaml yaml
# ]; ];
# }; };
oil = { oil = {
enable = true; enable = true;
settings = { settings = {

82
moduler/programs/waybar/default.nix
View file

@ -59,7 +59,6 @@ let
"upower" "upower"
"custom/tailscale" "custom/tailscale"
"custom/netbird" "custom/netbird"
"custom/bitwarden"
"network" "network"
"clock" "clock"
] ]
@ -70,7 +69,6 @@ let
"bluetooth" "bluetooth"
"custom/tailscale" "custom/tailscale"
"custom/netbird" "custom/netbird"
"custom/bitwarden"
"network" "network"
"clock" "clock"
]; ];
@ -191,20 +189,6 @@ let
return-type = "json"; return-type = "json";
interval = 5; interval = 5;
}; };
"custom/bitwarden" = {
exec = "/home/fw/.config/waybar/scripts/bitwarden.sh --status";
on-click = "/home/fw/.config/waybar/scripts/bitwarden.sh --toggle";
exec-on-event = true;
format = "BW {icon} {text}";
format-icons = {
connected = "";
stopped = "";
};
tooltip = true;
return-type = "json";
interval = 5;
};
}; };
waybarStyle = '' waybarStyle = ''
@ -254,8 +238,7 @@ let
#upower, #upower,
#network, #network,
#custom-tailscale, #custom-tailscale,
#custom-netbird, #custom-netbird {
#custom-bitwarden {
background: @base; background: @base;
border: none; border: none;
border-radius: 5px; border-radius: 5px;
@ -322,7 +305,6 @@ let
#upower, #upower,
#custom-tailscale, #custom-tailscale,
#custom-netbird, #custom-netbird,
#custom-bitwarden,
#network { #network {
background: @peach; background: @peach;
color: @base; color: @base;
@ -773,68 +755,6 @@ with lib;
''; '';
executable = true; executable = true;
}; };
xdg.configFile."waybar/scripts/bitwarden.sh" = {
text = ''
#!${pkgs.bash}/bin/bash
PATH=${
lib.makeBinPath [
pkgs.coreutils
pkgs.procps
pkgs.bitwarden-desktop
]
}
BITWARDEN_SSH_SOCK="''${HOME}/.bitwarden-ssh-agent.sock"
is_socket_active() {
[[ -S "$BITWARDEN_SSH_SOCK" ]]
}
show_status() {
if is_socket_active; then
echo "{\"text\":\"\",\"class\":\"connected\",\"alt\":\"connected\",\"tooltip\":\"Bitwarden SSH agent socket is active: $BITWARDEN_SSH_SOCK\"}"
else
echo "{\"text\":\"\",\"class\":\"stopped\",\"alt\":\"stopped\",\"tooltip\":\"Bitwarden SSH agent socket is inactive: $BITWARDEN_SSH_SOCK\"}"
fi
}
open_bitwarden() {
bitwarden >/dev/null 2>&1 &
show_status
}
stop_bitwarden() {
pkill -x bitwarden >/dev/null 2>&1 || true
show_status
}
toggle_bitwarden() {
if is_socket_active; then
stop_bitwarden
else
open_bitwarden
fi
}
case "$1" in
--status)
show_status
;;
--open)
open_bitwarden
;;
--toggle)
toggle_bitwarden
;;
*)
echo "Usage: $0 {--status|--open|--toggle}"
exit 1
;;
esac
'';
executable = true;
};
}; };
# catppuccin.waybar = { # catppuccin.waybar = {
# enable = true; # enable = true;

3
moduler/wedding.nix
View file

@ -16,8 +16,7 @@ let
version = "source"; version = "source";
src = inputs.wedding; src = inputs.wedding;
subPackages = [ "internal/cmd/app" ]; subPackages = [ "internal/cmd/app" ];
#vendorHash = "sha256-rxaikaR4UGXu2hIuR9ZbOnITBsCq5zEDAlwrhhRudoo="; vendorHash = "sha256-rxaikaR4UGXu2hIuR9ZbOnITBsCq5zEDAlwrhhRudoo=";
vendorHash = "sha256-9TAVoYShxqzeo2BUWEFmZ6PO4p9Q/BG4207ZEBmhq9I=";
env = { env = {
CGO_ENABLED = 0; CGO_ENABLED = 0;
}; };

19
secrets/sops.yaml
View file

@ -17,18 +17,9 @@ grafana_token: ENC[AES256_GCM,data:yAUqBV2/IF/wkyutHhf1Ui/xxRIt+SgsUk7QmdcnYa+x5
fleet-enroll-secret: ENC[AES256_GCM,data:2DEmgzsYvWZas65HLE4PaxZ3h7L4Gw8esVirZYrzCik=,iv:9t6ET8QnPLIl0Pnn9r24btF7VUQnRr3ukRH0oVsgIrg=,tag:mQ0yxEhx72L71DB36cfMew==,type:str] fleet-enroll-secret: ENC[AES256_GCM,data:2DEmgzsYvWZas65HLE4PaxZ3h7L4Gw8esVirZYrzCik=,iv:9t6ET8QnPLIl0Pnn9r24btF7VUQnRr3ukRH0oVsgIrg=,tag:mQ0yxEhx72L71DB36cfMew==,type:str]
jira_token: ENC[AES256_GCM,data:gPSgsNp4XlM6cTzLCpsJpdByTOHQ9vWfosurrd+yzo9MAkTcm5BDXwRWl1aNN2OFZu4+GXNqOho1gegDCQhZQnFRYNACASqmhGk6/GCpSNUlVAExOhvSs8tUu+YZoBUVufWHn5sIsxNHGgiJnX5ZtX7sVhUOo5u+qbb49iHsSZ6WBwP9SDMpfqXkhgZAURTk7iu7VgbHt6D1BxQH2yDCXR7OuICC5D6lSjdKo4Vbdudmz07vM1b4DHfvtP15SJfl,iv:oV3ACNPpz4Zb3bt0oWlx9On71LoXt3ZO5QosSr5XB2k=,tag:Xr0Y/ugZbQ2BaQtUJOwIng==,type:str] jira_token: ENC[AES256_GCM,data:gPSgsNp4XlM6cTzLCpsJpdByTOHQ9vWfosurrd+yzo9MAkTcm5BDXwRWl1aNN2OFZu4+GXNqOho1gegDCQhZQnFRYNACASqmhGk6/GCpSNUlVAExOhvSs8tUu+YZoBUVufWHn5sIsxNHGgiJnX5ZtX7sVhUOo5u+qbb49iHsSZ6WBwP9SDMpfqXkhgZAURTk7iu7VgbHt6D1BxQH2yDCXR7OuICC5D6lSjdKo4Vbdudmz07vM1b4DHfvtP15SJfl,iv:oV3ACNPpz4Zb3bt0oWlx9On71LoXt3ZO5QosSr5XB2k=,tag:Xr0Y/ugZbQ2BaQtUJOwIng==,type:str]
opencode_atlassian_env: ENC[AES256_GCM,data:v7uz9p4/H2WNzZA+I5+qnBRw4cyB4DNt/adBn0TS1bm9Gqk+UhnpjlXuP3mpxElXrAPmqT/rIvRGZp/YGiDWODH+B/WjtAaA/R+hFfOoP+m2unx2UM/a+UwC2EO+6ci+lKtNpT8FfobQxjuCdKWCmz0U54ijtfmyh73+lIzZoffs35fvxHwvchzM3zfCy/EHkR1jDUiKykX2VR1JiBZNa6PFp+SXZGvBlcjf8WjaryEpzIGv1plFftTQSo74OHPuUAC4kXrV9eCH4OJQ6JLyfOH+8tGstyyVWO9BtG7/fO5j830bBgvbqTsjZX+NvmTiaP4caC/sy7vseKkbgRzdUuAASLM3Pbqs9QnP6lFzye/QNdnlcwOOoNniXMbwynmSwtrz6w==,iv:DrArPdRddjxqMqU+38jvc1zCy2xVRmXOD7D9UQHQfgs=,tag:ZGCBxg28k1FMKwvu2r2Aqg==,type:str] opencode_atlassian_env: ENC[AES256_GCM,data:v7uz9p4/H2WNzZA+I5+qnBRw4cyB4DNt/adBn0TS1bm9Gqk+UhnpjlXuP3mpxElXrAPmqT/rIvRGZp/YGiDWODH+B/WjtAaA/R+hFfOoP+m2unx2UM/a+UwC2EO+6ci+lKtNpT8FfobQxjuCdKWCmz0U54ijtfmyh73+lIzZoffs35fvxHwvchzM3zfCy/EHkR1jDUiKykX2VR1JiBZNa6PFp+SXZGvBlcjf8WjaryEpzIGv1plFftTQSo74OHPuUAC4kXrV9eCH4OJQ6JLyfOH+8tGstyyVWO9BtG7/fO5j830bBgvbqTsjZX+NvmTiaP4caC/sy7vseKkbgRzdUuAASLM3Pbqs9QnP6lFzye/QNdnlcwOOoNniXMbwynmSwtrz6w==,iv:DrArPdRddjxqMqU+38jvc1zCy2xVRmXOD7D9UQHQfgs=,tag:ZGCBxg28k1FMKwvu2r2Aqg==,type:str]
google_oauth_client_id_styrelsen: ENC[AES256_GCM,data:nSbWYSreyn5+Qbf3hOYrpIAC2Eilp/gukox/c0DmjRNBy0DVHY/sKhy60GIM6L98pypmBA00Prx0aq1q506l80l9tcAnUOOC,iv:SMiQafz+ifJU7fW31UMYSZv2gelm+ADxQoy2iJfms4g=,tag:/T/kZAfcu/Ve8BgEr9MnAg==,type:str] google_oauth_client_id: ENC[AES256_GCM,data:ql6A5TCFJvK4fjKESWfpD5hUTnL/P9BQRZ6o7hrjtHo58h0OUkw8CUdy8pwmbbkz2JGgLpJjmOjOEMEWHfWJ9Yb++JlNBRbj,iv:4cnbgEbSEp1mayoq2w9TdQbUnxKyRdjdOT9cE34BCSE=,tag:iN0EokN8eEz47Dd9XUIA1A==,type:str]
google_oauth_client_secret_styrelsen: ENC[AES256_GCM,data:mMqnmusE6KPFH4lTqXg/mboslIiHrCTEnQuHGmMYZ0aN3sA=,iv:xVy1UFNfbuYimuqKza61GJdwkCZ/j3qiBCm8Esl7cPE=,tag:RmBgnRT5WmwL2YFbj+0tKQ==,type:str] google_oauth_client_secret: ENC[AES256_GCM,data:xKC3Ky5QFU3XrIx/37HhEbZEmcJDTgwZp6gqnVXKShT9ebQ=,iv:ofpmvGy3+R8oLJP1Z8JzOzuopJYnW9fYzkVyqOXtL/k=,tag:ZVSLAKGe3zhCfIWhSgCH0A==,type:str]
user_google_email_styrelsen: ENC[AES256_GCM,data:JRYtpeY2bGVu6gaAuMlZdlklW2UWIY9FXq2v,iv:BEtfCwloMEdJN2uTBwbq8ATRMW9XWtbR3DTtzH9/6Qw=,tag:shBSm2749ZnwLITAUMieWw==,type:str] user_google_email: ENC[AES256_GCM,data:TQn0Fh1BKa1NZMAm9aOaucL8RAGq/zvmD61i,iv:G6v5w7sLxbo2fOO470DUkCAixoVykCQ5RZCziEr6bbc=,tag:kreDA+JQqc4TZNJWNGovbA==,type:str]
user_google_email_core: ENC[AES256_GCM,data:azALLFW243+0y46jHGMfMwjEBWbth2ufF2E=,iv:gX36/P4VG189/QwUUPhmtlali4Y7U3pU2mLtW5EZOTs=,tag:1LxA7QsqpVN8RnJvde3HiA==,type:str]
google_oauth_client_id_core: ENC[AES256_GCM,data:R0ZoHDm1McgIqYSilmujguQTwZAozESasbLK+VCz5xU4pogH78H0I/pLL900ZFNUFr3nwoRSv4bG/aFJbtSxwXkKfcMMIEG7,iv:3LA8fl6QJd3Jh9tqyphrddgqYTwLwqGL71bdipwMqhA=,tag:hNLEhlOsHi2VpQf1JI7wUg==,type:str]
google_oauth_client_secret_core: ENC[AES256_GCM,data:JcuMQqrSxRZKFhrZ5Y5JeUCFsOb8ralJ6Ult7fBIrDGNTCc=,iv:0KHy8+/q0V5hkGYgXdXlq6i/G8NuKvi/rNSV4ztoF+8=,tag:6ZHFUEQlLVIeY7gU13NpWQ==,type:str]
mssql_server_core: ENC[AES256_GCM,data:G4ozEwlBqTqx,iv:Glg+tr4yQoL5IXG4kAcVyvdz4bhyAaRamVO3BC5JERY=,tag:Srz3oCy3+3kB8QzytBjoyw==,type:str]
mssql_database_core: ENC[AES256_GCM,data:niPf8ne2,iv:7/c1HwaRAObJ1E83+Au4T1RyVh2U+IHLNjOo8sWlcds=,tag:0Yp+o1NQkZjIGTfoTXsCLw==,type:str]
mssql_user_core: ENC[AES256_GCM,data:EGo=,iv:dfRX5GJdnz24RIS4SRLCCcavQ8WttGJg32N8NPcN0Es=,tag:Zbu2LCm2EWEYfr3OKouYfA==,type:str]
mssql_password_core: ENC[AES256_GCM,data:72kkh7A02lt0Cf0X,iv:h6vZR2Kw7Md73vFqpMPxL+0XVLaymEHfRGMQb8lobmY=,tag:ynnd+YIeh5O5YuNcITqdgg==,type:str]
vault_addr_core: ENC[AES256_GCM,data:OQIGGCAJQknET1ARyMKn4ahy8f4ZlIljqhpNFFcpRA==,iv:kQI9VBHYrtaw1a6+diYmD4kncsMXRSW55yHY5K/waq0=,tag:zWsmzo2uSHsnJmzPvoZ8Gw==,type:str]
vault_token_core: ENC[AES256_GCM,data:3UPIIzCB6CKS1UN083NvOSMUlgiVvCh7nnxRcA==,iv:jxXYJbJJa3THKuynmPMv/quUSLn+VI8+sup4xfReEjQ=,tag:UTRBCpIqz5XHGSNBWl8I8g==,type:str]
sops: sops:
age: age:
- recipient: age1jeyw96795qu52swmtkjqgr2w3g4vxc43ckc5r4hlwpje23ptnfwsheah0s - recipient: age1jeyw96795qu52swmtkjqgr2w3g4vxc43ckc5r4hlwpje23ptnfwsheah0s
@ -85,7 +76,7 @@ sops:
WnpOSEZhNG1MZ2ZhelN5d2grSVl0L1kKt8fWIXZMeQMXaD3WT6joRa0YEmjHc4FU WnpOSEZhNG1MZ2ZhelN5d2grSVl0L1kKt8fWIXZMeQMXaD3WT6joRa0YEmjHc4FU
IIge9bmr548WkDDq7uu0fbhgimiqRdjt0KxG0NnwlWm5MzpTOaYlQw== IIge9bmr548WkDDq7uu0fbhgimiqRdjt0KxG0NnwlWm5MzpTOaYlQw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2026-04-20T09:24:02Z" lastmodified: "2026-04-04T21:39:51Z"
mac: ENC[AES256_GCM,data:7JvoexmSi2+yUxXMZljxwSoekxgPgEJtq21yVfkm5PO6+IvbrVD0fiKzcup7N8G9prgBUPYPvQV69eF6zxMz/zg58FdFKZ8HejNCUGrEeQ9lNXgqy6llSSDd7hj7b/e2OEo0zKLPA4s5ZmqXtE/G/Fa1V9kF0xMOwhkHWvHL++k=,iv:9tNusL5mmHrJC2Rif79JVf5V9TawXul02gLPl2IchMo=,tag:xfpzVqIKc+BVFGPKl8ickQ==,type:str] mac: ENC[AES256_GCM,data:udqMJ5wLMgNypgbgHJtvCk6DuXMVE9InuitxrkPp4y5S8seEyH292zuzB7c7z8rGRntaxopZPNBkOgAPXZkD9uiS7B2iaQlQJslZJt5JxuDdJB+s/F9mNzvJVIDdw4fLdwrMqPHTS+2aVDJKMgByZFecUdx8M93EV6j1KJ6igvw=,iv:wYRy5/2o+yao6v2l7Wv4ea0FXjXt/mY591i4C4LpUQ4=,tag:iVsEQ83fPS3fNLfqu1AYRQ==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.12.2 version: 3.12.2