Compare commits

..

No commits in common. "a75ef902af5fd7807918423a79f349034d7e03aa" and "2095205ab5fbf0a74a2e587993745afe2fedc0a0" have entirely different histories.

13 changed files with 123 additions and 271 deletions

4
.gitignore vendored
View File

@ -7,7 +7,3 @@ docs/masaoka.jpg
docs/tsunemori.jpg docs/tsunemori.jpg
ginoza/hardware-configuration.nix ginoza/hardware-configuration.nix
docs/image.txt
docs/logo.png

View File

@ -10,7 +10,7 @@
- best NixOS starter dotfiles in the **flake** setup - best NixOS starter dotfiles in the **flake** setup
- [Mirror Github](https://github.com/foglar/nixos-config) - [Mirror Github](https://github.com/foglar/nixos-config)
- [Mirror Gitea](https://git.foglar.tech/foglar/dotfiles) - [Mirror Gitea](https://github.com/foglar/dotfiles)
## Showcase ## Showcase
@ -31,7 +31,11 @@
- This will download script with installation commands - This will download script with installation commands
```bash ```bash
nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' git+https://git.foglar.tech/foglar/psychonix-install.git" nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' git+https://git.foglar.tech/foglar/dotfiles.git"
```
```bash
nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' github:foglar/nixos-config"
``` ```
> [!IMPORTANT] > [!IMPORTANT]

View File

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736102453, "lastModified": 1734906446,
"narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "4846091641f3be0ad7542086d52769bb7932bde6", "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736492828, "lastModified": 1733175750,
"narHash": "sha256-iDvgL5dQerQnu2ERKAWGvWppG7cQ/0uKEfVY93ItvO4=", "narHash": "sha256-tczSI0dnsitstia/uVt7FyGQbtuW8lMhhMYj0TRSAT4=",
"owner": "AdnanHodzic", "owner": "AdnanHodzic",
"repo": "auto-cpufreq", "repo": "auto-cpufreq",
"rev": "c0d9ec565a4c78247a4f70beb1c1ae74279673e2", "rev": "4dae1d4b59bedc1d57118a9eb704c2e1cde5f83c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1736568198, "lastModified": 1735979945,
"narHash": "sha256-RBTk5KavYsPZ56m9C2evS4pDkEu3+NdxY6mFNbo8DH8=", "narHash": "sha256-qT25PnbcQ30ypnI8fNazRDsq3WmBXC8Lo+OvPr+Ct+o=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "7f8746a7ef2d15b8fb4acc63cb0d7e3a407739bf", "rev": "b93d8cdf12139da45146a6c3cf53141a437c41ec",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -142,22 +142,6 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1734969791,
"narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe",
"type": "github"
},
"original": {
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -300,11 +284,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1736566108, "lastModified": 1735943291,
"narHash": "sha256-r+FXWU/hfgO3lAHYs9Q03iCShnC42mZd1pnmIIp8Z9k=", "narHash": "sha256-igXLrO0AtN7+k7VaR5zaHaPhDcS3go5NZr4liVqW9g4=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "918ccdba5cc65ccd1fb48a54c71306d869299441", "rev": "1baf8928a0bd6ccc2f49e1e9478baab71d49a018",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -313,37 +297,6 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"stylix",
"flake-compat"
],
"gitignore": "gitignore_2",
"nixpkgs": [
"stylix",
"nixpkgs"
],
"nixpkgs-stable": [
"stylix",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731363552,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -366,28 +319,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore_2": {
"inputs": {
"nixpkgs": [
"stylix",
"git-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"
}
},
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -412,11 +343,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736508663, "lastModified": 1735979091,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "rev": "11ab08541e61ac3bbf2ab27229f68622629401df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -512,11 +443,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736115290, "lastModified": 1734906236,
"narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +474,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1736542519, "lastModified": 1735946701,
"narHash": "sha256-gGxZNtLLqDPtXB5OZbEltfLW5ZzB6zXGobcuKPt02lg=", "narHash": "sha256-jCIIiEjgIs02N36fJCd+aU7QiqqdMWokfpFWO+sTdn0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "cef09fbfe6624d2133d81be863bd48bcfc5939d3", "rev": "60f069d54015fec66e63f1ff7e6ff26ddb349976",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -568,11 +499,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774328, "lastModified": 1735734474,
"narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -597,11 +528,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736114838, "lastModified": 1734906472,
"narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "6997fe382dcf396704227d2b98ffdd5066da6959", "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +557,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735393019, "lastModified": 1734906259,
"narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "rev": "0404833ea18d543df44df935ebf1b497310eb046",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -651,11 +582,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736164519, "lastModified": 1735316583,
"narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3c895da64b0eb19870142196fa48c07090b441c4", "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +607,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735493474, "lastModified": 1734793513,
"narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -696,11 +627,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736415517, "lastModified": 1735984946,
"narHash": "sha256-qZlj9JUQIQErvifjOxjDdAUE66Je3qyH/yQiCOucZlc=", "narHash": "sha256-j6ZDTw9w64yC7sf9T2uwNbJjNNno1PiVUb3eQUgv1X8=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "aa440d766064b7097140062b39e41df4a1af4251", "rev": "f75baa0990fce4fb51281e01b4a1ec2326231a47",
"revCount": 4, "revCount": 3,
"type": "git", "type": "git",
"url": "https://git.foglar.tech/foglar/nix-flake-install-script" "url": "https://git.foglar.tech/foglar/nix-flake-install-script"
}, },
@ -739,11 +670,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736154240, "lastModified": 1735774660,
"narHash": "sha256-I8Ot6/CInJFphhK9L3T1558q4OOOXwl3f2d0SuKjYcE=", "narHash": "sha256-g/9+jzWvu73YPHw9AB/yVCDSld7GdovliAUkfVP7YU0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "8741cadfa29d9c7beeeb9b1308ef58c62c54e129", "rev": "5f12c696cae384350f95f2af9dffe39ee0e445e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -782,11 +713,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1735834308,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -862,11 +793,27 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1730741070,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1735669367,
"narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -956,11 +903,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736549395, "lastModified": 1735049224,
"narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -976,14 +923,15 @@
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
] ],
"nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1735882644, "lastModified": 1734797603,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1005,7 +953,7 @@
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-droid": "nixpkgs-droid", "nixpkgs-droid": "nixpkgs-droid",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_3",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
@ -1035,11 +983,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736515725, "lastModified": 1735844895,
"narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1056,11 +1004,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736568948, "lastModified": 1735964101,
"narHash": "sha256-nnaMeMQPDg1GLQPBejn4nBtvQKSRVv64IIPZ7XmX5u0=", "narHash": "sha256-FUKeipaDxAFf+0jun6CKk37g7UALIeisSz6L19KL+WM=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "3da50a44c6c47b3361e56231123797101892c565", "rev": "5b2bbc7a627ea983cef34f4a8ec81cd597529943",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1075,10 +1023,8 @@
"base16-fish": "base16-fish", "base16-fish": "base16-fish",
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": [ "nixpkgs": [
@ -1087,15 +1033,14 @@
"systems": "systems_3", "systems": "systems_3",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux"
"tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736530113, "lastModified": 1735933801,
"narHash": "sha256-a+IUtGdzESNSQEZkW99TXf5js8o4Oy9M4H2am+2ECp4=", "narHash": "sha256-SbkFaIYzfoasvu6GN5fdlaltrcEtUcoPsTRulWNkH7E=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "f1e003194cb528bbd4eda50b781d1f703611782d", "rev": "e0a41d3a2562ce1b43cad8560333673d04b111b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1199,22 +1144,6 @@
"type": "github" "type": "github"
} }
}, },
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1725758778,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-zed",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [

View File

@ -1,31 +1,5 @@
set positional-arguments default:
@default: run:
just update git clone https://git.foglar.tech/foglar/dotfiles.git --depth 1 ~/.dotfiles
@deploy profile:
just clone
just hardware-generation ~/.dotfiles/kogami
just hardware-generation ~/.dotfiles/ginoza
just build $1
@clone:
git clone https://git.foglar.tech/foglar/dotfiles.git ~/.dotfiles
@quick-clone:
git clone https://git.foglar.tech/foglar/dotfiles.git ~/.dotfiles --depth 1
@update:
cd ~/.dotfiles && git pull && nix flake update
@remove:
gum confirm && rm -rf ~/.dotfiles || echo "File ~/.dotfiles not removed"
@install rebuild-argument entrypoint:
sudo nixos-rebuild $1 --flake ~/.dotfiles#$2
@switch flake-entrypoint:
just install switch $1
@build flake-entrypoint:
just install build $1
@hardware-generation path:
sudo nixos-generate-config --dir $1

View File

@ -72,12 +72,10 @@
}; };
# Basic programs to enable # Basic programs to enable
programs = { programs.kdeconnect.enable = true;
kdeconnect.enable = true; programs.wireshark.enable = true;
wireshark.enable = true; programs.auto-cpufreq.enable = true;
auto-cpufreq.enable = true; programs.nix-ld.dev.enable = true;
nix-ld.dev.enable = true;
};
environment.systemPackages = [inputs.install-script.packages.x86_64-linux.default]; environment.systemPackages = [inputs.install-script.packages.x86_64-linux.default];

View File

@ -1,5 +1,6 @@
{ {
userSettings, userSettings,
pkgs,
... ...
}: { }: {
# Home manager configuration # Home manager configuration

View File

@ -16,9 +16,6 @@
qutebrowser qutebrowser
ferdium ferdium
bitwarden
bitwarden-cli
file-roller file-roller
stellarium stellarium
libreoffice libreoffice

View File

@ -25,13 +25,13 @@
ranger ranger
unzip unzip
fd fd
imagemagick # convert images from formats like jpg, png, etc. imagemagick
toybox # convert images from formats like jpg, png, etc.
] ]
++ ( ++ (
if pkgs.system == "x86_64-linux" if pkgs.system == "x86_64-linux"
then [ then [
nvtopPackages.full #nvtopPackages.full
toybox
] ]
else [] else []
); );

View File

@ -127,7 +127,6 @@
"${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store # clipboard store text data" "${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store # clipboard store text data"
"${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store # clipboard store image data" "${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store # clipboard store image data"
"${pkgs.swayosd}/bin/swayosd-server" "${pkgs.swayosd}/bin/swayosd-server"
"${pkgs.bitwarden}/bin/bitwarden"
"systemctl --user start hyprpolkitagent" "systemctl --user start hyprpolkitagent"

View File

@ -127,12 +127,6 @@
keyword = "git"; keyword = "git";
url = "https://git.foglar.tech"; url = "https://git.foglar.tech";
} }
{
name = "Vaultwarden";
tags = ["vaultwarden"];
keyword = "vault";
url = "https://vault.foglar.duckdns.org";
}
]; ];
} }
]; ];
@ -153,7 +147,6 @@
duckduckgo-privacy-essentials duckduckgo-privacy-essentials
return-youtube-dislikes return-youtube-dislikes
user-agent-string-switcher user-agent-string-switcher
privacy-badger
] ]
else [] else []
); );

View File

@ -1,39 +0,0 @@
{
lib,
config,
userSettings,
...
}: {
options = {
program.syncthing.enable = lib.mkEnableOption "syncthing";
};
config = lib.mkIf config.program.syncthing.enable {
services.syncthing = {
enable = true;
openDefaultPorts = true;
settings.gui = {
user = "${userSettings.username}";
#! password = "test";
#! User Hashed password is stored in SOPS
#! and is set in the module configuration
#! file ./sops/sops.nix
};
settings = {
devices = {
"Masaoka" = {id = "LGQUK6E-YEPVYKC-5MNXXHO-FZRD6SE-BBPHNGE-RKRGSSW-WIIWNVA-ZO3DKQO";};
"Tsunemori" = {id = "JPOXL54-KPM6LBK-52B6NDP-3PC76WS-VNMSQLK-2S4HWDZ-6ORFJ55-7KDO3QG";};
};
#folders = {
# "Documents" = {
# path = "/home/${userSettings.username}/Documents";
# devices = ["Masaoka"];
# };
#};
};
};
systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true";
};
}

View File

@ -22,7 +22,6 @@
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
users.users.${userSettings.username}.extraGroups = ["networkmanager"]; users.users.${userSettings.username}.extraGroups = ["networkmanager"];
networking.nameservers = ["192.168.8.140" "1.1.1.1"];
}) })
( (
lib.mkIf config.sys.bluetooth.enable { lib.mkIf config.sys.bluetooth.enable {

View File

@ -19,26 +19,27 @@
terminal.font = "${pkgs.terminus-nerdfont}share/fonts/truetype/NerdFonts/Terminess/TerminessNerdFont-Regular.ttf"; terminal.font = "${pkgs.terminus-nerdfont}share/fonts/truetype/NerdFonts/Terminess/TerminessNerdFont-Regular.ttf";
# Simply install just the packages # Simply install just the packages
#environment.packages = with pkgs; [ environment.packages = with pkgs; [
# Some common stuff that people expect to have nano
#procps # Some common stuff that people expect to have
#killall #procps
#diffutils #killall
#findutils #diffutils
#utillinux #findutils
#tzdata #utillinux
#hostname #tzdata
#man #hostname
#gnugrep #man
#gnupg #gnugrep
#gnused #gnupg
#gnutar #gnused
#bzip2 #gnutar
#gzip #bzip2
#xz #gzip
#zip #xz
#unzip #zip
#]; #unzip
];
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
system.stateVersion = "24.05"; system.stateVersion = "24.05";