Compare commits
9 Commits
23.05
...
37f98443bf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37f98443bf | ||
|
|
ae2a87ef23 | ||
|
|
ea8a1c1136 | ||
|
|
496ee9a993 | ||
|
|
e791bda05e | ||
|
|
4143c41deb | ||
|
|
a070bbdd20 | ||
|
|
a4b860a99e | ||
|
|
2a6a33e392 |
34
flake.lock
generated
34
flake.lock
generated
@@ -42,16 +42,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695108154,
|
||||
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
||||
"lastModified": 1706981411,
|
||||
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "07682fff75d41f18327a871088d20af2710d4744",
|
||||
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.05",
|
||||
"ref": "release-23.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -64,11 +64,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685908677,
|
||||
"narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=",
|
||||
"lastModified": 1710868679,
|
||||
"narHash": "sha256-V1o2bCZdeYKP/0zgVp4EN0KUjMItAMk6J7SvCXUI5IU=",
|
||||
"owner": "guibou",
|
||||
"repo": "nixGL",
|
||||
"rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5",
|
||||
"rev": "d709a8abcde5b01db76ca794280745a43c8662be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -79,27 +79,27 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1698942558,
|
||||
"narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=",
|
||||
"lastModified": 1710838473,
|
||||
"narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "621f51253edffa1d6f08d5fce4f08614c852d17e",
|
||||
"rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-23.05",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1699131694,
|
||||
"narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=",
|
||||
"lastModified": 1710923589,
|
||||
"narHash": "sha256-lKYSsx0BQbcXVZf14vpf2yD7r7pakHQ7173pxXmgvk4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "6226a48fb329802a63da2babbdd2d375713af333",
|
||||
"rev": "6b42f9fe3099d436ada62d4e41a36673caa10bbf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -120,11 +120,11 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1699094435,
|
||||
"narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
|
||||
"lastModified": 1710827359,
|
||||
"narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454",
|
||||
"rev": "5710127d9693421e78cca4f74fac2db6d67162b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.05";
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
|
||||
@@ -19,4 +19,8 @@
|
||||
profiles.zsh.enable = true;
|
||||
|
||||
profiles.games.enable = true;
|
||||
|
||||
home.packages = [
|
||||
pkgs.unstable.osu-lazer
|
||||
];
|
||||
}
|
||||
|
||||
@@ -44,8 +44,6 @@ in
|
||||
nix-tree
|
||||
unstable.comma
|
||||
|
||||
rnix-lsp
|
||||
|
||||
openvpn
|
||||
|
||||
ldns
|
||||
@@ -74,7 +72,7 @@ in
|
||||
ncdu
|
||||
|
||||
bat
|
||||
exa
|
||||
eza
|
||||
ripgrep
|
||||
] ++ lib.optionals cfg.plus [
|
||||
ffmpeg-full
|
||||
@@ -110,7 +108,7 @@ in
|
||||
|
||||
mkvtoolnix
|
||||
] ++ lib.optionals (config.profiles.gui.enable && (config ? nixpkgs && config.nixpkgs.config.allowUnfree) ) [
|
||||
geogebra
|
||||
# geogebra
|
||||
];
|
||||
|
||||
programs.firefox = {
|
||||
@@ -259,6 +257,11 @@ in
|
||||
hostname = "desktop.daniel";
|
||||
user = "dan";
|
||||
};
|
||||
"ubuntu-ai" = {
|
||||
hostname = "100.64.0.2";
|
||||
port = 2222;
|
||||
user = "daniel";
|
||||
};
|
||||
"laptop" = {
|
||||
hostname = "laptop.daniel";
|
||||
user = "daniel";
|
||||
@@ -282,10 +285,6 @@ in
|
||||
"gitlab.stud.idi.ntnu.no" = {
|
||||
proxyJump = "login.pvv.ntnu.no";
|
||||
};
|
||||
"consolidation" = {
|
||||
hostname = "62.92.111.62";
|
||||
user = "root";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ in {
|
||||
# warsow
|
||||
# xonotic
|
||||
# zeroad
|
||||
unstable.osu-lazer
|
||||
|
||||
# nur.repos.ivar.sm64ex
|
||||
# dolphinEmuMaster
|
||||
|
||||
@@ -47,8 +47,6 @@ in
|
||||
|
||||
export XDG_CURRENT_DESKTOP=kde
|
||||
export DESKTOP_SESSION=kde
|
||||
|
||||
export QT_STYLE_OVERRIDE="breeze"
|
||||
'';
|
||||
|
||||
windowManager = {
|
||||
@@ -142,7 +140,7 @@ in
|
||||
|
||||
|
||||
gtk = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
theme = {
|
||||
package = pkgs.breeze-gtk;
|
||||
name = "Breeze";
|
||||
@@ -152,11 +150,10 @@ in
|
||||
name = "breeze";
|
||||
};
|
||||
};
|
||||
qt = {
|
||||
enable = true;
|
||||
#useGtkTheme = true;
|
||||
platformTheme = "gtk";
|
||||
};
|
||||
# qt = {
|
||||
# enable = true;
|
||||
# platformTheme = "gtk";
|
||||
# };
|
||||
|
||||
xsession.windowManager.command = lib.mkIf non-nixos.enable (lib.mkForce "${pkgs.nixgl.auto.nixGLDefault}/bin/nixGL ${config.xsession.windowManager.i3.package}/bin/i3");
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ in
|
||||
};
|
||||
shellAliases = {
|
||||
cat = "bat";
|
||||
ls = "exa";
|
||||
tree = "exa -T";
|
||||
ls = "eza";
|
||||
tree = "eza -T";
|
||||
df = "df -h";
|
||||
|
||||
sysu = "systemctl --user";
|
||||
|
||||
Reference in New Issue
Block a user