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